Vm-dev April 2015

vm-dev@lists.squeakfoundation.org

45 participants
264 discussions

VM Maker: VMMaker.oscog-tpr.1150.mcz
by commits＠source.squeak.org 02 Apr '15

02 Apr '15

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1150.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.1150 Author: tpr Time: 1 April 2015, 5:27:16.284 pm UUID: af1f8f36-86cf-4fa7-9dad-1f92603c7891 Ancestors: VMMaker.oscog-eem.1149 Protect components of the ARM memory instructions from too-large values. Improve the MoveRXwr/XwrRR code a tad. Part of a low-level review of the instruction building code. =============== Diff against VMMaker.oscog-eem.1149 =============== Item was changed: ----- Method: CogARMCompiler>>concretizeMoveRXwrR (in category 'generate machine code - concretize') ----- concretizeMoveRXwrR "Will get inlined into concretizeAt: switch." "Write the word in R(src) into memory at address (base+4*index)" <inline: true> | index base src | src := self concreteRegister: (operands at: 0). index := self concreteRegister: (operands at: 1). "index is number of *words* = 4* bytes" base := self concreteRegister: (operands at: 2). "str src, [base, +index, LSL #2]" "cond 011 1100 0 base srcR 00010 00 0 inde" + self machineCodeAt: 0 put: (self memMxr: AL reg: src base: base p: 1 u: 1 b: 0 w: 0 l: 0 rmLsl2: index). - self machineCodeAt: 0 put: (self str: src rn: base rm: (16r100 bitOr: index)). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>concretizeMoveXwrRR (in category 'generate machine code - concretize') ----- concretizeMoveXwrRR "Will get inlined into concretizeAt: switch." <inline: true> | index base dest | index := self concreteRegister: (operands at: 0). base := self concreteRegister: (operands at: 1). dest := self concreteRegister: (operands at: 2). "LDR dest, [base, +index, LSL #2]" + "cond 011 1100 1 base dest 00010 00 0 inde bulit by lowest level generator so we can do the lsl #2 on the index register" + self machineCodeAt: 0 put: (self memMxr: AL reg: dest base: base p: 1 u: 1 b: 0 w: 0 l: 1 rmLsl2: index). - "cond 011 1100 1 base dest 00010 00 0 inde" - self machineCodeAt: 0 put: (self ldr: dest rn: base rm: (16r100 bitOr: index)). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>is12BitValue:ifTrue:ifFalse: (in category 'testing') ----- is12BitValue: constant ifTrue: trueAlternativeBlock ifFalse: falseAlternativeBlock + "For LDR and STR, there is an instruction allowing for one instruction encoding if the offset is encodable in signed 12 bit form. pass the trueBlock the value and a 1-bit flag to tell it the sign. + The falseBlock can do whatever it needs to, typically building the constant as a full 32bit value and then ld/st with that as a register offset" - "For LDR and STR, there is an instruction allowing for one instruction encoding if the offset is encodable in 12 bit." constant abs <= 4095 "(2 raisedTo: 12)-1" ifTrue: [ constant >= 0 ifTrue: [trueAlternativeBlock value: 1 value: constant] ifFalse: [trueAlternativeBlock value: 0 value: constant abs]] ifFalse: falseAlternativeBlock! Item was changed: ----- Method: CogARMCompiler>>ldrb:rn:plus:imm: (in category 'ARM convenience instructions') ----- ldrb: destReg rn: baseReg plus: u imm: immediate12bitValue + " LDRB destReg, [baseReg, 'u' immediate12bitValue] u=0 -> subtract imm; =1 -> add imm + Note that this is a very low level interface that does not check the sign of the immediate, nor validity. See for example #concretizeMoveMbrR" - " LDRB destReg, [baseReg, 'u' immediate12bitValue] u=0 -> subtract imm; =1 -> add imm " ^self memMxr: AL reg: destReg base: baseReg u: u b: 1 l: 1 imm: immediate12bitValue! Item was changed: ----- Method: CogARMCompiler>>memMxr:reg:base:p:u:b:w:l:rm: (in category 'encoding') ----- memMxr: cond reg: destReg base: baseReg p: postpreoffset u: updown b: byteword w: weirdstuff l: loadstore rm: offsetReg "build an ARM [base +/- offsetReg] memory instruction p -> pre-index (1) or post-index (0) the offset. Combines with W to do some odd things. u -> up (1) or down (0) ie + or - for the offset b -> byte(1) or word (0) w -> write-back (1) if pre-indexing. l -> load (1) or store (0)" + ^ (cond bitAnd: 16rF) << 28 - ^ cond << 28 bitOr: (3 << 25 + bitOr: ((postpreoffset bitAnd: 1) << 24 + bitOr: ((updown bitAnd: 1) << 23 + bitOr: ((byteword bitAnd: 1) << 22 + bitOr: ((weirdstuff bitAnd: 1) << 21 + bitOr: ((loadstore bitAnd: 1) << 20 + bitOr: ((baseReg bitAnd: 16rF) << 16 + bitOr: ((destReg bitAnd: 16rF) << 12 + bitOr: (offsetReg bitAnd: 16rF)))))))))! - bitOr: (postpreoffset << 24 - bitOr: (updown << 23 - bitOr: (byteword << 22 - bitOr: (weirdstuff << 21 - bitOr: (loadstore << 20 - bitOr: (baseReg << 16 - bitOr: (destReg << 12 bitOr: offsetReg))))))))! Item was added: + ----- Method: CogARMCompiler>>memMxr:reg:base:p:u:b:w:l:rmLsl2: (in category 'encoding') ----- + memMxr: cond reg: destReg base: baseReg p: postpreoffset u: updown b: byteword w: weirdstuff l: loadstore rmLsl2: offsetReg + "build an ARM [base +/- offsetReg lsl #2] memory instruction - see also #memMxr:reg:base:p:u:b:w:l:rm: and keep them correlated properly + p -> pre-index (1) or post-index (0) the offset. Combines with W to do some odd things. + u -> up (1) or down (0) ie + or - for the offset + b -> byte(1) or word (0) + w -> write-back (1) if pre-indexing. + l -> load (1) or store (0)" + ^ (cond bitAnd: 16rF) << 28 + bitOr: (3 << 25 + bitOr: ((postpreoffset bitAnd: 1) << 24 + bitOr: ((updown bitAnd: 1) << 23 + bitOr: ((byteword bitAnd: 1) << 22 + bitOr: ((weirdstuff bitAnd: 1) << 21 + bitOr: ((loadstore bitAnd: 1) << 20 + bitOr: ((baseReg bitAnd: 16rF) << 16 + bitOr: ((destReg bitAnd: 16rF) << 12 + bitOr: (16r100 + bitOr: (offsetReg bitAnd: 16rF))))))))))! Item was changed: ----- Method: CogARMCompiler>>memMxr:reg:base:u:b:l:imm: (in category 'encoding') ----- memMxr: cond reg: destReg base: baseReg u: updown b: byteword l: loadstore imm: immediate12bitValue + "This is the lowest level build of an ARM [base +/- immediate 12bit offset] memory instruction - "build an ARM [base +/- immediate 12bit offset] memory instruction u -> up (1) or down (0) ie + or - for the offset b -> byte(1) or word (0) l -> load (1) or store (0)" + ^ (cond bitAnd: 16rF) << 28 - ^ cond << 28 bitOr: (5<<24 + bitOr: ((updown bitAnd: 1) << 23 + bitOr:((byteword bitAnd: 1) <<22 + bitOr:((loadstore bitAnd: 1) <<20 + bitOr:((baseReg bitAnd: 16rF) <<16 + bitOr:((destReg bitAnd: 16rF) <<12 + bitOr: (immediate12bitValue bitAnd: 16rFFF)))))))! - bitOr: (updown << 23 - bitOr:(byteword<<22 - bitOr:(loadstore<<20 - bitOr:(baseReg<<16 - bitOr:(destReg<<12 - bitOr: immediate12bitValue))))))!

1 0

[commit][3300] CogVM source as per VMMaker.oscog-eem.1148
by commits＠squeakvm.org 02 Apr '15

02 Apr '15

Revision: 3300 Author: eliot Date: 2015-04-01 16:03:46 -0700 (Wed, 01 Apr 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1148 Define startpc in closure creation jitting appropriately (and hence correctly for Sista). Nuke the squeak.sista.v3 builds; we're doing only sista.spur VMs. Modified Paths: -------------- branches/Cog/build.macos32x86/makesista branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h Removed Paths: ------------- branches/Cog/build.linux32x86/squeak.sista.v3/ branches/Cog/build.macos32x86/squeak.sista.v3/ branches/Cog/build.win32x86/squeak.sista.v3/ Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/makesista =================================================================== --- branches/Cog/build.macos32x86/makesista 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/build.macos32x86/makesista 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,6 +1,6 @@ #!/bin/bash trap 'exit 2' HUP INT PIPE TERM -DIRS="squeak.sista.spur squeak.sista.v3" +DIRS="squeak.sista.spur" for d in $DIRS; do if test -d "$d"; then (cd $d;./mvm -A) Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/nsspursrc/vm/cogit.c 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb from - StackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -19396,14 +19396,16 @@ sqInt numArgs; sqInt numCopied; sqInt reg; + sqInt startpc; assert(needsFrame); - addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 3, (numArgs = (byte1 & 7) + ((extA % 16) * 8)), (numCopied = ((((usqInt) byte1) >> 3) & 7) + ((extA / 16) * 8)), byte2 + (extB << 8)); + startpc = bytecodePC + (((generatorAt(byte0))->numBytes)); + addBlockStartAtnumArgsnumCopiedspan(startpc, (numArgs = (byte1 & 7) + ((extA % 16) * 8)), (numCopied = ((((usqInt) byte1) >> 3) & 7) + ((extA / 16) * 8)), byte2 + (extB << 8)); extA = (extB = 0); assert(getActiveContextAllocatesInMachineCode()); (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 4, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); for (i = 1; i <= numCopied; i += 1) { reg = ssStorePoptoPreferredReg(1, TempReg); genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); @@ -19416,7 +19418,7 @@ (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 4, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); if (numCopied > 0) { ssPop(numCopied); } @@ -20565,13 +20567,15 @@ sqInt numArgs; sqInt numCopied; sqInt reg; + sqInt startpc; assert(needsFrame); - addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + startpc = bytecodePC + (((generatorAt(byte0))->numBytes)); + addBlockStartAtnumArgsnumCopiedspan(startpc, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); assert(getActiveContextAllocatesInMachineCode()); (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); for (i = 1; i <= numCopied; i += 1) { reg = ssStorePoptoPreferredReg(1, TempReg); genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); @@ -20584,7 +20588,7 @@ (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); if (numCopied > 0) { ssPop(numCopied); } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Apr 1 15:39:00 PDT 2015 + Wed Apr 1 16:04:13 PDT 2015 Modified: branches/Cog/sistasrc/vm/cogit.c =================================================================== --- branches/Cog/sistasrc/vm/cogit.c 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/sistasrc/vm/cogit.c 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -18822,9 +18822,11 @@ sqInt numArgs; sqInt numCopied; sqInt reg; + sqInt startpc; assert(needsFrame); - addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 3, (numArgs = (byte1 & 7) + ((extA % 16) * 8)), (numCopied = ((((usqInt) byte1) >> 3) & 7) + ((extA / 16) * 8)), byte2 + (extB << 8)); + startpc = bytecodePC + (((generatorAt(byte0))->numBytes)); + addBlockStartAtnumArgsnumCopiedspan(startpc, (numArgs = (byte1 & 7) + ((extA % 16) * 8)), (numCopied = ((((usqInt) byte1) >> 3) & 7) + ((extA / 16) * 8)), byte2 + (extB << 8)); extA = (extB = 0); if (numCopied > 0) { @@ -18833,7 +18835,7 @@ (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegand(SendNumArgsReg, ReceiverResultReg); - genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 4, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); if (numCopied > 0) { ssPop(numCopied); } @@ -19873,9 +19875,11 @@ sqInt numArgs; sqInt numCopied; sqInt reg; + sqInt startpc; assert(needsFrame); - addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + startpc = bytecodePC + (((generatorAt(byte0))->numBytes)); + addBlockStartAtnumArgsnumCopiedspan(startpc, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); if (numCopied > 0) { ssFlushTo(simStackPtr); @@ -19883,7 +19887,7 @@ (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegand(SendNumArgsReg, ReceiverResultReg); - genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); if (numCopied > 0) { ssPop(numCopied); } Modified: branches/Cog/sistasrc/vm/cogit.h =================================================================== --- branches/Cog/sistasrc/vm/cogit.h 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/sistasrc/vm/cogit.h 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ Modified: branches/Cog/spursistasrc/vm/cogit.c =================================================================== --- branches/Cog/spursistasrc/vm/cogit.c 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/spursistasrc/vm/cogit.c 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -20282,14 +20282,16 @@ sqInt numArgs; sqInt numCopied; sqInt reg; + sqInt startpc; assert(needsFrame); - addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 3, (numArgs = (byte1 & 7) + ((extA % 16) * 8)), (numCopied = ((((usqInt) byte1) >> 3) & 7) + ((extA / 16) * 8)), byte2 + (extB << 8)); + startpc = bytecodePC + (((generatorAt(byte0))->numBytes)); + addBlockStartAtnumArgsnumCopiedspan(startpc, (numArgs = (byte1 & 7) + ((extA % 16) * 8)), (numCopied = ((((usqInt) byte1) >> 3) & 7) + ((extA / 16) * 8)), byte2 + (extB << 8)); extA = (extB = 0); assert(getActiveContextAllocatesInMachineCode()); (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 4, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); for (i = 1; i <= numCopied; i += 1) { reg = ssStorePoptoPreferredReg(1, TempReg); genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); @@ -20302,7 +20304,7 @@ (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 4, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); if (numCopied > 0) { ssPop(numCopied); } @@ -21344,13 +21346,15 @@ sqInt numArgs; sqInt numCopied; sqInt reg; + sqInt startpc; assert(needsFrame); - addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + startpc = bytecodePC + (((generatorAt(byte0))->numBytes)); + addBlockStartAtnumArgsnumCopiedspan(startpc, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); assert(getActiveContextAllocatesInMachineCode()); (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); for (i = 1; i <= numCopied; i += 1) { reg = ssStorePoptoPreferredReg(1, TempReg); genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); @@ -21363,7 +21367,7 @@ (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); if (numCopied > 0) { ssPop(numCopied); } Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/spursrc/vm/cogit.c 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb from - StackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -18352,13 +18352,15 @@ sqInt numArgs; sqInt numCopied; sqInt reg; + sqInt startpc; assert(needsFrame); - addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + startpc = bytecodePC + (((generatorAt(byte0))->numBytes)); + addBlockStartAtnumArgsnumCopiedspan(startpc, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); assert(getActiveContextAllocatesInMachineCode()); (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genNoPopCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); for (i = 1; i <= numCopied; i += 1) { reg = ssStorePoptoPreferredReg(1, TempReg); genStoreSourceRegslotIndexintoNewObjectInDestReg(reg, (ClosureFirstCopiedValueIndex + numCopied) - i, ReceiverResultReg); @@ -18371,7 +18373,7 @@ (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegandand(ReceiverResultReg, SendNumArgsReg, ClassReg); - genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); if (numCopied > 0) { ssPop(numCopied); } Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/spursrc/vm/cogit.h 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/src/vm/cogit.c 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb from - StackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + StackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -17013,9 +17013,11 @@ sqInt numArgs; sqInt numCopied; sqInt reg; + sqInt startpc; assert(needsFrame); - addBlockStartAtnumArgsnumCopiedspan(bytecodePC + 4, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); + startpc = bytecodePC + (((generatorAt(byte0))->numBytes)); + addBlockStartAtnumArgsnumCopiedspan(startpc, (numArgs = byte1 & 15), (numCopied = ((usqInt) byte1) >> 4), (byte2 << 8) + byte3); if (numCopied > 0) { ssFlushTo(simStackPtr); @@ -17023,7 +17025,7 @@ (optStatus.isReceiverResultRegLive = 0); ssAllocateCallRegand(SendNumArgsReg, ReceiverResultReg); - genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(bytecodePC + 5, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); + genCreateClosureAtnumArgsnumCopiedcontextNumArgslargeinBlock(startpc + 1, numArgs, numCopied, methodOrBlockNumArgs, methodNeedsLargeContext(methodObj), inBlock); if (numCopied > 0) { ssPop(numCopied); } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2015-04-01 22:38:58 UTC (rev 3299) +++ branches/Cog/src/vm/cogit.h 2015-04-01 23:03:46 UTC (rev 3300) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1147 uuid: 0fd3920d-c904-484f-b436-e6563dce31c2 + CCodeGenerator VMMaker.oscog-eem.1148 uuid: b67f9693-ad92-4951-ad6b-a62a64bf4ddb */

1 0

VM Maker: VMMaker.oscog-eem.1149.mcz
by commits＠source.squeak.org 02 Apr '15

02 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1149.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1149 Author: eem Time: 1 April 2015, 3:54:45.797 pm UUID: 985fbd74-7cbc-419b-92ed-d0cc3cc58dad Ancestors: VMMaker.oscog-eem.1148 Nuke the SqueakCogSista VM; we're only doing SqueakSpurCogSista. =============== Diff against VMMaker.oscog-eem.1148 =============== Item was changed: ----- Method: VMMaker class>>generateAllCogConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllCogConfigurationsUnderVersionControl self generateNewspeakSpurCogVM; generateSqueakCogVM; generateSqueakCogMTVM; generateSqueakSpurCogVM; - generateSqueakCogSistaVM; generateSqueakSpurCogSistaVM! Item was changed: ----- Method: VMMaker class>>generateAllNonSpurConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllNonSpurConfigurationsUnderVersionControl self generateSqueakCogVM; generateSqueakCogMTVM; + generateSqueakStackVM! - generateSqueakStackVM; - generateSqueakCogSistaVM! Item was changed: ----- Method: VMMaker class>>generateAllSistaConfigurationsUnderVersionControl (in category 'configurations') ----- generateAllSistaConfigurationsUnderVersionControl + self generateSqueakSpurCogSistaVM! - self generateSqueakCogSistaVM; - generateSqueakSpurCogSistaVM! Item was removed: - ----- Method: VMMaker class>>generateSqueakCogSistaVM (in category 'configurations') ----- - generateSqueakCogSistaVM - "No primitives since we can use those for the Cog VM" - ^VMMaker - generate: CoInterpreter - and: SistaStackToRegisterMappingCogit - with: #( SistaVM true - MULTIPLEBYTECODESETS true - ISA IA32 - bytecodeTableInitializer initializeBytecodeTableForSqueakV3PlusClosuresSistaV1Hybrid) - to: (FileDirectory default pathFromURI: self sourceTree, '/sistasrc') - platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') - including: #()!

1 0

VM Maker: VMMaker.oscog-eem.1148.mcz
by commits＠source.squeak.org 02 Apr '15

02 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1148.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1148 Author: eem Time: 1 April 2015, 3:47:27.079 pm UUID: b67f9693-ad92-4951-ad6b-a62a64bf4ddb Ancestors: VMMaker.oscog-eem.1147 Define startpc in closure creation jitting appropriately (and hence correctly for Sista) =============== Diff against VMMaker.oscog-eem.1147 =============== Item was changed: ----- Method: StackToRegisterMappingCogit>>genExtPushClosureBytecode (in category 'bytecode generators') ----- genExtPushClosureBytecode "Block compilation. At this point in the method create the block. Note its start and defer generating code for it until after the method and any other preceeding blocks. The block's actual code will be compiled later." "253 11111101 eei i i kkk jjjjjjjj Push Closure Num Copied iii (+ Ext A // 16 * 8) Num Args kkk (+ Ext A \\ 16 * 8) BlockSize jjjjjjjj (+ Ext B * 256). ee = num extensions" + | startpc numArgs numCopied | - | numArgs numCopied | self assert: needsFrame. + startpc := bytecodePC + (self generatorAt: byte0) numBytes. + self addBlockStartAt: startpc "0 relative" - self addBlockStartAt: bytecodePC + 3 "0 relative" numArgs: (numArgs := (byte1 bitAnd: 16r7) + (extA \\ 16 * 8)) numCopied: (numCopied := ((byte1 >> 3) bitAnd: 7) + (extA // 16 * 8)) span: byte2 + (extB << 8). extA := extB := 0. objectRepresentation createsClosuresInline ifTrue: [self assert: objectRepresentation getActiveContextAllocatesInMachineCode. optStatus isReceiverResultRegLive: false. self ssAllocateCallReg: ReceiverResultReg and: SendNumArgsReg and: ClassReg. objectRepresentation + genNoPopCreateClosureAt: startpc + 1 "1 relative" - genNoPopCreateClosureAt: bytecodePC + 4 "1 relative" numArgs: numArgs numCopied: numCopied contextNumArgs: methodOrBlockNumArgs large: (coInterpreter methodNeedsLargeContext: methodObj) inBlock: inBlock. 1 to: numCopied do: [:i| | reg | reg := self ssStorePop: true toPreferredReg: TempReg. objectRepresentation genStoreSourceReg: reg slotIndex: ClosureFirstCopiedValueIndex + numCopied - i intoNewObjectInDestReg: ReceiverResultReg]. ^self ssPushRegister: ReceiverResultReg]. numCopied > 0 ifTrue: [self ssFlushTo: simStackPtr]. optStatus isReceiverResultRegLive: false. objectRepresentation getActiveContextAllocatesInMachineCode ifTrue: [self ssAllocateCallReg: ReceiverResultReg and: SendNumArgsReg and: ClassReg] ifFalse: [self ssAllocateCallReg: SendNumArgsReg and: ReceiverResultReg]. objectRepresentation + genCreateClosureAt: startpc + 1 "1 relative" - genCreateClosureAt: bytecodePC + 4 "1 relative" numArgs: numArgs numCopied: numCopied contextNumArgs: methodOrBlockNumArgs large: (coInterpreter methodNeedsLargeContext: methodObj) inBlock: inBlock. numCopied > 0 ifTrue: [self ssPop: numCopied]. ^self ssPushRegister: ReceiverResultReg! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPushClosureCopyCopiedValuesBytecode (in category 'bytecode generators') ----- genPushClosureCopyCopiedValuesBytecode "Block compilation. At this point in the method create the block. Note its start and defer generating code for it until after the method and any other preceeding blocks. The block's actual code will be compiled later." "143 10001111 llllkkkk jjjjjjjj iiiiiiii Push Closure Num Copied llll Num Args kkkk BlockSize jjjjjjjjiiiiiiii" + | startpc numArgs numCopied | - | numArgs numCopied | self assert: needsFrame. + startpc := bytecodePC + (self generatorAt: byte0) numBytes. + self addBlockStartAt: startpc "0 relative" - self addBlockStartAt: bytecodePC + 4 "0 relative" numArgs: (numArgs := byte1 bitAnd: 16rF) numCopied: (numCopied := byte1 >> 4) span: (byte2 << 8) + byte3. objectRepresentation createsClosuresInline ifTrue: [self assert: objectRepresentation getActiveContextAllocatesInMachineCode. optStatus isReceiverResultRegLive: false. self ssAllocateCallReg: ReceiverResultReg and: SendNumArgsReg and: ClassReg. objectRepresentation + genNoPopCreateClosureAt: startpc + 1 "1 relative" - genNoPopCreateClosureAt: bytecodePC + 5 "1 relative" numArgs: numArgs numCopied: numCopied contextNumArgs: methodOrBlockNumArgs large: (coInterpreter methodNeedsLargeContext: methodObj) inBlock: inBlock. 1 to: numCopied do: [:i| | reg | reg := self ssStorePop: true toPreferredReg: TempReg. objectRepresentation genStoreSourceReg: reg slotIndex: ClosureFirstCopiedValueIndex + numCopied - i intoNewObjectInDestReg: ReceiverResultReg]. ^self ssPushRegister: ReceiverResultReg]. numCopied > 0 ifTrue: [self ssFlushTo: simStackPtr]. optStatus isReceiverResultRegLive: false. objectRepresentation getActiveContextAllocatesInMachineCode ifTrue: [self ssAllocateCallReg: ReceiverResultReg and: SendNumArgsReg and: ClassReg] ifFalse: [self ssAllocateCallReg: SendNumArgsReg and: ReceiverResultReg]. objectRepresentation + genCreateClosureAt: startpc + 1 "1 relative" - genCreateClosureAt: bytecodePC + 5 "1 relative" numArgs: numArgs numCopied: numCopied contextNumArgs: methodOrBlockNumArgs large: (coInterpreter methodNeedsLargeContext: methodObj) inBlock: inBlock. numCopied > 0 ifTrue: [self ssPop: numCopied]. ^self ssPushRegister: ReceiverResultReg!

1 0

[commit][3299] Doh! Commit nssendcache.h now it's used in the build.
by commits＠squeakvm.org 02 Apr '15

02 Apr '15

Revision: 3299 Author: eliot Date: 2015-04-01 15:38:58 -0700 (Wed, 01 Apr 2015) Log Message: ----------- Doh! Commit nssendcache.h now it's used in the build. Added Paths: ----------- branches/Cog/nsspursrc/vm/nssendcache.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/nsspursrc/vm/nssendcache.h =================================================================== --- branches/Cog/nsspursrc/vm/nssendcache.h (rev 0) +++ branches/Cog/nsspursrc/vm/nssendcache.h 2015-04-01 22:38:58 UTC (rev 3299) @@ -0,0 +1,11 @@ +/* Automatically generated by + CCodeGenerator VMMaker.oscog-eem.1137 uuid: f5b1b284-2ce3-43df-a03a-279529d7091c + */ + +typedef struct { + sqInt selector; + sqInt numArgs; + sqInt classTag; + sqInt enclosingObject; + sqInt target; + } NSSendCache; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Apr 1 15:36:07 PDT 2015 + Wed Apr 1 15:39:00 PDT 2015

1 0

[commit][3298] Update the GdbARMPlugin xcode proj file in the squeak.cog. v3 build.
by commits＠squeakvm.org 02 Apr '15

02 Apr '15

Revision: 3298 Author: eliot Date: 2015-04-01 15:35:49 -0700 (Wed, 01 Apr 2015) Log Message: ----------- Update the GdbARMPlugin xcode proj file in the squeak.cog.v3 build. Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj 2015-04-01 22:16:03 UTC (rev 3297) +++ branches/Cog/build.macos32x86/squeak.cog.v3/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj 2015-04-01 22:35:49 UTC (rev 3298) @@ -14,7 +14,6 @@ 737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libopcodes.a */; }; 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libsim.a */; }; 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.6/include -I../../../processors/ARM/mac/gdb-7.6/sim/arm -I../../../processors/ARM/mac/gdb-7.6/bfd"; }; }; - 73F560891AB76408009B44A3 /* armulmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 73F560881AB76408009B44A3 /* armulmem.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.6/include -I../../../processors/ARM/mac/gdb-7.6/sim/arm -I../../../processors/ARM/mac/gdb-7.6/bfd"; }; }; 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; }; /* End PBXBuildFile section */ @@ -28,7 +27,6 @@ 737482B40EE733BD004E10F8 /* libsim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsim.a; path = "../../../processors/ARM/mac/gdb-7.6/sim/arm/libsim.a"; sourceTree = SOURCE_ROOT; }; 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = sqGdbARMPlugin.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c; sourceTree = SOURCE_ROOT; }; 73ADAA901AB79ED50085DAA8 /* libbfd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbfd.a; path = "../../../processors/ARM/mac/binutils-2.25/bfd/libbfd.a"; sourceTree = SOURCE_ROOT; }; - 73F560881AB76408009B44A3 /* armulmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = armulmem.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/armulmem.c; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GdbARMPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; @@ -89,7 +87,6 @@ isa = PBXGroup; children = ( 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */, - 73F560881AB76408009B44A3 /* armulmem.c */, 732787F51AB7A40100BE5008 /* libiberty.a */, 732787F11AB7A12A00BE5008 /* environ.c */, 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */, @@ -174,7 +171,6 @@ files = ( 73020E8D0EE714E60021D217 /* GdbARMPlugin.c in Sources */, 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */, - 73F560891AB76408009B44A3 /* armulmem.c in Sources */, 732788241AB7C73500BE5008 /* environ.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Apr 1 15:11:15 PDT 2015 + Wed Apr 1 15:36:07 PDT 2015

1 0

[commit][3297] CogVM source as per VMMaker.oscog-eem.1147
by commits＠squeakvm.org 02 Apr '15

02 Apr '15

Revision: 3297 Author: eliot Date: 2015-04-01 15:16:03 -0700 (Wed, 01 Apr 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1147 Retract the decision to type the results of the bitwise operators as unsigned; it breaks at least the BitBlt plugin. Integrate primitiveIsBigEnder & Nicolas' fix for safer primitiveAdoptInstance & primitiveScanCharacters Refactor send generation to take the send table to use as an argument. rename sendTable to ordinarySendTable. Mark relevant feature test methods in CogAbstractInstruction as <inline: true>. Rename executeCogMethod:... to executeCogPIC:... Spur: Make sure that all stacked values are followed in CoInterpreter>> makeBaseFrameFor: for stale self refs in super sends. Make sure the stack is scanned after a pin operation that involves forwarding. Make sure that the unforwarding stack scan post-become (or post-pin) scans all of the stack contents in the CoInterpreter, since super sends have no read barrier. Newspeak: Add Ryan's new self-send bytecodes. Use NSSendCache for IRC representation. Modified Paths: -------------- branches/Cog/build.macos32x86/squeak.sista.spur/makevm branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/findUnofficialFiles branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/ branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit Removed Paths: ------------- branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit branches/Cog/nscogbuild/ branches/Cog/nscogsrc/ Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Deleted: branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/makeit 2015-03-26 04:04:13 UTC (rev 3292) +++ branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit 2015-04-01 22:16:03 UTC (rev 3297) @@ -1,19 +0,0 @@ -clear -xcodebuild -configuration Debug -project BochsIA32Plugin.xcodeproj -xcodebuild -configuration Release -project BochsIA32Plugin.xcodeproj -for d in Assert.app Debug.app -do - if [ -d "../$d" ]; then - echo installed Debug BochsIA32Plugin in ../$d - rm -rf "../$d/Contents/Resources/BochsIA32Plugin.bundle" - cp -R build/Debug/BochsIA32Plugin.bundle "../$d/Contents/Resources" - fi -done -for d in Fast.app Croquet.app -do - if [ -d "../$d" ]; then - echo installed Release BochsIA32Plugin in ../$d - rm -rf "../$d/Contents/Resources/BochsIA32Plugin.bundle" - cp -R build/Release/BochsIA32Plugin.bundle "../$d/Contents/Resources" - fi -done Copied: branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit (from rev 3294, branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/makeit) =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit (rev 0) +++ branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit 2015-04-01 22:16:03 UTC (rev 3297) @@ -0,0 +1,19 @@ +clear +xcodebuild -configuration Debug -project BochsIA32Plugin.xcodeproj +xcodebuild -configuration Release -project BochsIA32Plugin.xcodeproj +for d in Assert.app Debug.app +do + if [ -d "../$d" ]; then + echo installed Debug BochsIA32Plugin in ../$d + rm -rf "../$d/Contents/Resources/BochsIA32Plugin.bundle" + cp -R build/Debug/BochsIA32Plugin.bundle "../$d/Contents/Resources" + fi +done +for d in Fast.app Croquet.app Squeak.app +do + if [ -d "../$d" ]; then + echo installed Release BochsIA32Plugin in ../$d + rm -rf "../$d/Contents/Resources/BochsIA32Plugin.bundle" + cp -R build/Release/BochsIA32Plugin.bundle "../$d/Contents/Resources" + fi +done Deleted: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj 2015-03-26 04:04:13 UTC (rev 3292) +++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj 2015-04-01 22:16:03 UTC (rev 3297) @@ -1,304 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 73020E8D0EE714E60021D217 /* GdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* GdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/GdbARMPlugin -I\"../../../platforms/Mac OS/vm\" -I../../../spursrc/vm"; }; }; - 732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 732787F51AB7A40100BE5008 /* libiberty.a */; }; - 732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73ADAA901AB79ED50085DAA8 /* libbfd.a */; }; - 732788241AB7C73500BE5008 /* environ.c in Sources */ = {isa = PBXBuildFile; fileRef = 732787F11AB7A12A00BE5008 /* environ.c */; }; - 737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libopcodes.a */; }; - 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libsim.a */; }; - 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.6/include -I../../../processors/ARM/mac/gdb-7.6/sim/arm -I../../../processors/ARM/mac/gdb-7.6/bfd"; }; }; - 73F560891AB76408009B44A3 /* armulmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 73F560881AB76408009B44A3 /* armulmem.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.6/include -I../../../processors/ARM/mac/gdb-7.6/sim/arm -I../../../processors/ARM/mac/gdb-7.6/bfd"; }; }; - 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; - 73020E8C0EE714E60021D217 /* GdbARMPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = GdbARMPlugin.c; path = ../../../src/plugins/GdbARMPlugin/GdbARMPlugin.c; sourceTree = SOURCE_ROOT; }; - 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GdbARMPlugin.h; path = ../../../platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h; sourceTree = SOURCE_ROOT; }; - 732787F11AB7A12A00BE5008 /* environ.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = environ.c; path = "../../../platforms/Mac OS/plugins/GdbARMPlugin/environ.c"; sourceTree = SOURCE_ROOT; }; - 732787F51AB7A40100BE5008 /* libiberty.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiberty.a; path = "../../../processors/ARM/mac/binutils-2.25/libiberty/libiberty.a"; sourceTree = SOURCE_ROOT; }; - 737482B20EE7339F004E10F8 /* libopcodes.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopcodes.a; path = "../../../processors/ARM/mac/gdb-7.6/opcodes/libopcodes.a"; sourceTree = SOURCE_ROOT; }; - 737482B40EE733BD004E10F8 /* libsim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsim.a; path = "../../../processors/ARM/mac/gdb-7.6/sim/arm/libsim.a"; sourceTree = SOURCE_ROOT; }; - 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = sqGdbARMPlugin.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c; sourceTree = SOURCE_ROOT; }; - 73ADAA901AB79ED50085DAA8 /* libbfd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbfd.a; path = "../../../processors/ARM/mac/binutils-2.25/bfd/libbfd.a"; sourceTree = SOURCE_ROOT; }; - 73F560881AB76408009B44A3 /* armulmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = armulmem.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/armulmem.c; sourceTree = SOURCE_ROOT; }; - 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; - 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GdbARMPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; - DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; - DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; - DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; - DA3A20F90AA63D000050B983 /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; }; - DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8D01CCCD0486CAD60068D4B7 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */, - 737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */, - 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */, - 732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */, - 732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 089C166AFE841209C02AAC07 /* GdbARMPlugin */ = { - isa = PBXGroup; - children = ( - 737482B20EE7339F004E10F8 /* libopcodes.a */, - 73ADAA901AB79ED50085DAA8 /* libbfd.a */, - 737482B40EE733BD004E10F8 /* libsim.a */, - 08FB77ADFE841716C02AAC07 /* Source */, - 089C167CFE841241C02AAC07 /* Resources */, - 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */, - 19C28FB4FE9D528D11CA2CBB /* Products */, - ); - name = GdbARMPlugin; - sourceTree = "<group>"; - }; - 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */, - ); - name = "External Frameworks and Libraries"; - sourceTree = "<group>"; - }; - 089C167CFE841241C02AAC07 /* Resources */ = { - isa = PBXGroup; - children = ( - 8D01CCD10486CAD60068D4B7 /* Info.plist */, - ); - name = Resources; - sourceTree = "<group>"; - }; - 08FB77ADFE841716C02AAC07 /* Source */ = { - isa = PBXGroup; - children = ( - 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */, - 73F560881AB76408009B44A3 /* armulmem.c */, - 732787F51AB7A40100BE5008 /* libiberty.a */, - 732787F11AB7A12A00BE5008 /* environ.c */, - 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */, - 73020E8C0EE714E60021D217 /* GdbARMPlugin.c */, - DA3A20F80AA63D000050B983 /* config.h */, - DA3A20F90AA63D000050B983 /* sqConfig.h */, - DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */, - DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */, - DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */, - DA3A20F50AA63CBF0050B983 /* interp.h */, - ); - name = Source; - sourceTree = "<group>"; - }; - 19C28FB4FE9D528D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */, - ); - name = Products; - sourceTree = "<group>"; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 8D01CCC60486CAD60068D4B7 /* GdbARMPlugin */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "GdbARMPlugin" */; - buildPhases = ( - 8D01CCC90486CAD60068D4B7 /* Resources */, - 8D01CCCB0486CAD60068D4B7 /* Sources */, - 8D01CCCD0486CAD60068D4B7 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = GdbARMPlugin; - productInstallPath = "$(HOME)/Library/Bundles"; - productName = GdbARMPlugin; - productReference = 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */; - productType = "com.apple.product-type.bundle"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 089C1669FE841209C02AAC07 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "GdbARMPlugin" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 089C166AFE841209C02AAC07 /* GdbARMPlugin */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8D01CCC60486CAD60068D4B7 /* GdbARMPlugin */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D01CCC90486CAD60068D4B7 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8D01CCCB0486CAD60068D4B7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 73020E8D0EE714E60021D217 /* GdbARMPlugin.c in Sources */, - 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */, - 73F560891AB76408009B44A3 /* armulmem.c in Sources */, - 732788241AB7C73500BE5008 /* environ.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 4FADC23408B4156C00ABE55E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Library/Bundles"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\""; - PRODUCT_NAME = GdbARMPlugin; - WRAPPER_EXTENSION = bundle; - ZERO_LINK = YES; - }; - name = Debug; - }; - 4FADC23508B4156C00ABE55E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = i386; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = NO; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Library/Bundles"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\""; - PRODUCT_NAME = GdbARMPlugin; - WRAPPER_EXTENSION = bundle; - }; - name = Release; - }; - 4FADC23808B4156C00ABE55E /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; - CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)"; - COPY_PHASE_STRIP = NO; - GCC_MODEL_TUNING = ""; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; - PREBINDING = NO; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = /Developer/SDKs/MacOSX10.6.sdk; - STRIP_INSTALLED_PRODUCT = NO; - USER_HEADER_SEARCH_PATHS = ""; - USE_HEADERMAP = NO; - }; - name = Debug; - }; - 4FADC23908B4156C00ABE55E /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; - CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)"; - COPY_PHASE_STRIP = NO; - GCC_MODEL_TUNING = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; - PREBINDING = NO; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = /Developer/SDKs/MacOSX10.6.sdk; - USER_HEADER_SEARCH_PATHS = ""; - USE_HEADERMAP = NO; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "GdbARMPlugin" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4FADC23408B4156C00ABE55E /* Debug */, - 4FADC23508B4156C00ABE55E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "GdbARMPlugin" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4FADC23808B4156C00ABE55E /* Debug */, - 4FADC23908B4156C00ABE55E /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 089C1669FE841209C02AAC07 /* Project object */; -} Copied: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj (from rev 3293, branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj) =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj (rev 0) +++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj 2015-04-01 22:16:03 UTC (rev 3297) @@ -0,0 +1,300 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 42; + objects = { + +/* Begin PBXBuildFile section */ + 73020E8D0EE714E60021D217 /* GdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* GdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/GdbARMPlugin -I\"../../../platforms/Mac OS/vm\" -I../../../spursrc/vm"; }; }; + 732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 732787F51AB7A40100BE5008 /* libiberty.a */; }; + 732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73ADAA901AB79ED50085DAA8 /* libbfd.a */; }; + 732788241AB7C73500BE5008 /* environ.c in Sources */ = {isa = PBXBuildFile; fileRef = 732787F11AB7A12A00BE5008 /* environ.c */; }; + 737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libopcodes.a */; }; + 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libsim.a */; }; + 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.6/include -I../../../processors/ARM/mac/gdb-7.6/sim/arm -I../../../processors/ARM/mac/gdb-7.6/bfd"; }; }; + 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; + 73020E8C0EE714E60021D217 /* GdbARMPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = GdbARMPlugin.c; path = ../../../src/plugins/GdbARMPlugin/GdbARMPlugin.c; sourceTree = SOURCE_ROOT; }; + 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GdbARMPlugin.h; path = ../../../platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h; sourceTree = SOURCE_ROOT; }; + 732787F11AB7A12A00BE5008 /* environ.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = environ.c; path = "../../../platforms/Mac OS/plugins/GdbARMPlugin/environ.c"; sourceTree = SOURCE_ROOT; }; + 732787F51AB7A40100BE5008 /* libiberty.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiberty.a; path = "../../../processors/ARM/mac/binutils-2.25/libiberty/libiberty.a"; sourceTree = SOURCE_ROOT; }; + 737482B20EE7339F004E10F8 /* libopcodes.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopcodes.a; path = "../../../processors/ARM/mac/gdb-7.6/opcodes/libopcodes.a"; sourceTree = SOURCE_ROOT; }; + 737482B40EE733BD004E10F8 /* libsim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsim.a; path = "../../../processors/ARM/mac/gdb-7.6/sim/arm/libsim.a"; sourceTree = SOURCE_ROOT; }; + 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = sqGdbARMPlugin.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c; sourceTree = SOURCE_ROOT; }; + 73ADAA901AB79ED50085DAA8 /* libbfd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbfd.a; path = "../../../processors/ARM/mac/binutils-2.25/bfd/libbfd.a"; sourceTree = SOURCE_ROOT; }; + 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; + 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GdbARMPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; + DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; + DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; + DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; + DA3A20F90AA63D000050B983 /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; }; + DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 8D01CCCD0486CAD60068D4B7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */, + 737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */, + 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */, + 732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */, + 732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 089C166AFE841209C02AAC07 /* GdbARMPlugin */ = { + isa = PBXGroup; + children = ( + 737482B20EE7339F004E10F8 /* libopcodes.a */, + 73ADAA901AB79ED50085DAA8 /* libbfd.a */, + 737482B40EE733BD004E10F8 /* libsim.a */, + 08FB77ADFE841716C02AAC07 /* Source */, + 089C167CFE841241C02AAC07 /* Resources */, + 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */, + 19C28FB4FE9D528D11CA2CBB /* Products */, + ); + name = GdbARMPlugin; + sourceTree = "<group>"; + }; + 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = { + isa = PBXGroup; + children = ( + 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */, + ); + name = "External Frameworks and Libraries"; + sourceTree = "<group>"; + }; + 089C167CFE841241C02AAC07 /* Resources */ = { + isa = PBXGroup; + children = ( + 8D01CCD10486CAD60068D4B7 /* Info.plist */, + ); + name = Resources; + sourceTree = "<group>"; + }; + 08FB77ADFE841716C02AAC07 /* Source */ = { + isa = PBXGroup; + children = ( + 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */, + 732787F51AB7A40100BE5008 /* libiberty.a */, + 732787F11AB7A12A00BE5008 /* environ.c */, + 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */, + 73020E8C0EE714E60021D217 /* GdbARMPlugin.c */, + DA3A20F80AA63D000050B983 /* config.h */, + DA3A20F90AA63D000050B983 /* sqConfig.h */, + DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */, + DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */, + DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */, + DA3A20F50AA63CBF0050B983 /* interp.h */, + ); + name = Source; + sourceTree = "<group>"; + }; + 19C28FB4FE9D528D11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */, + ); + name = Products; + sourceTree = "<group>"; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 8D01CCC60486CAD60068D4B7 /* GdbARMPlugin */ = { + isa = PBXNativeTarget; + buildConfigurationList = 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "GdbARMPlugin" */; + buildPhases = ( + 8D01CCC90486CAD60068D4B7 /* Resources */, + 8D01CCCB0486CAD60068D4B7 /* Sources */, + 8D01CCCD0486CAD60068D4B7 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = GdbARMPlugin; + productInstallPath = "$(HOME)/Library/Bundles"; + productName = GdbARMPlugin; + productReference = 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */; + productType = "com.apple.product-type.bundle"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 089C1669FE841209C02AAC07 /* Project object */ = { + isa = PBXProject; + buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "GdbARMPlugin" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 089C166AFE841209C02AAC07 /* GdbARMPlugin */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8D01CCC60486CAD60068D4B7 /* GdbARMPlugin */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8D01CCC90486CAD60068D4B7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 8D01CCCB0486CAD60068D4B7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 73020E8D0EE714E60021D217 /* GdbARMPlugin.c in Sources */, + 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */, + 732788241AB7C73500BE5008 /* environ.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 4FADC23408B4156C00ABE55E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\""; + PRODUCT_NAME = GdbARMPlugin; + WRAPPER_EXTENSION = bundle; + ZERO_LINK = YES; + }; + name = Debug; + }; + 4FADC23508B4156C00ABE55E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = i386; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(HOME)/Library/Bundles"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\""; + PRODUCT_NAME = GdbARMPlugin; + WRAPPER_EXTENSION = bundle; + }; + name = Release; + }; + 4FADC23808B4156C00ABE55E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; + CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)"; + COPY_PHASE_STRIP = NO; + GCC_MODEL_TUNING = ""; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; + PREBINDING = NO; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; + SDKROOT = /Developer/SDKs/MacOSX10.6.sdk; + STRIP_INSTALLED_PRODUCT = NO; + USER_HEADER_SEARCH_PATHS = ""; + USE_HEADERMAP = NO; + }; + name = Debug; + }; + 4FADC23908B4156C00ABE55E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)"; + CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)"; + COPY_PHASE_STRIP = NO; + GCC_MODEL_TUNING = ""; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon; + PREBINDING = NO; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; + SDKROOT = /Developer/SDKs/MacOSX10.6.sdk; + USER_HEADER_SEARCH_PATHS = ""; + USE_HEADERMAP = NO; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "GdbARMPlugin" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4FADC23408B4156C00ABE55E /* Debug */, + 4FADC23508B4156C00ABE55E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "GdbARMPlugin" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4FADC23808B4156C00ABE55E /* Debug */, + 4FADC23908B4156C00ABE55E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 089C1669FE841209C02AAC07 /* Project object */; +} Deleted: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/makeit 2015-03-26 04:04:13 UTC (rev 3292) +++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit 2015-04-01 22:16:03 UTC (rev 3297) @@ -1,19 +0,0 @@ -clear -xcodebuild -configuration Debug -project GdbARMPlugin.xcodeproj -xcodebuild -configuration Release -project GdbARMPlugin.xcodeproj -for d in Assert.app Debug.app -do - if [ -d "../$d" ]; then - echo installed Debug GdbARMPlugin in ../$d - rm -rf "../$d/Contents/Resources/GdbARMPlugin.bundle" - cp -R build/Debug/GdbARMPlugin.bundle "../$d/Contents/Resources" - fi -done -for d in Fast.app Croquet.app -do - if [ -d "../$d" ]; then - echo installed Release GdbARMPlugin in ../$d - rm -rf "../$d/Contents/Resources/GdbARMPlugin.bundle" - cp -R build/Release/GdbARMPlugin.bundle "../$d/Contents/Resources" - fi -done Copied: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit (from rev 3294, branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/makeit) =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit (rev 0) +++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit 2015-04-01 22:16:03 UTC (rev 3297) @@ -0,0 +1,19 @@ +clear +xcodebuild -configuration Debug -project GdbARMPlugin.xcodeproj +xcodebuild -configuration Release -project GdbARMPlugin.xcodeproj +for d in Assert.app Debug.app +do + if [ -d "../$d" ]; then + echo installed Debug GdbARMPlugin in ../$d + rm -rf "../$d/Contents/Resources/GdbARMPlugin.bundle" + cp -R build/Debug/GdbARMPlugin.bundle "../$d/Contents/Resources" + fi +done +for d in Fast.app Croquet.app Squeak.app +do + if [ -d "../$d" ]; then + echo installed Release GdbARMPlugin in ../$d + rm -rf "../$d/Contents/Resources/GdbARMPlugin.bundle" + cp -R build/Release/GdbARMPlugin.bundle "../$d/Contents/Resources" + fi +done Modified: branches/Cog/build.macos32x86/squeak.sista.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2015-03-29 00:30:44 UTC (rev 3296) +++ branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2015-04-01 22:16:03 UTC (rev 3297) @@ -113,7 +113,6 @@ rm -rf "$DEST/Contents/Resources/SqueakSSL.bundle" cp -R SqueakSSL/build/$XCD_BUILD_CONFIGURATION/SqueakSSL.bundle "$DEST/Contents/Resources" -if false; then # Build the BochsIA32Plugin # N.B. To build the plugin you also have to build the Bochs libraries in # ../../processors/IA32/bochs. cd ../../processors/IA32/bochs. Run conf.COG & makeem. @@ -121,6 +120,17 @@ xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle" cp -R BochsIA32Plugin/build/$XCD_BUILD_CONFIGURATION/BochsIA32Plugin.bundle "$DEST/Contents/Resources" + +# Build the GdbARMPlugin +# N.B. To build the plugin you also have to build the gdb ARM sim libraries in +# ../../processors/ARM/mac. +if test -f ../../processors/ARM/mac/gdb-7.6/opcodes/libopcodes.a; then +echo GdbARMPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project GdbARMPlugin/GdbARMPlugin.xcodeproj +xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project GdbARMPlugin/GdbARMPlugin.xcodeproj +rm -rf "$DEST/Contents/Resources/GdbARMPlugin.bundle" +cp -R GdbARMPlugin/build/$XCD_BUILD_CONFIGURATION/GdbARMPlugin.bundle "$DEST/Contents/Resources" +else +echo "not building GdbARMPlugin; support libraries unavailable" fi # Build the UnixOSProcessPlugin Modified: branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c 2015-03-29 00:30:44 UTC (rev 3296) +++ branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c 2015-04-01 22:16:03 UTC (rev 3297) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1080 uuid: 8b1a09b7-4f58-4375-b16a-e42e63ffd542 + VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec from - UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 + UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f */ -static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 " __DATE__ ; +static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f " __DATE__ ; @@ -120,9 +120,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (i)" + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.18 (i)" #else - "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (e)" + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.18 (e)" #endif ; @@ -256,7 +256,7 @@ sqSocketBytes = arrayValueOf(objectPointer); idx = 0; - while (idx < (socketRecordSize())) { + while (idx < (sizeof(SQSocket))) { if ((sqSocketBytes[idx]) != 0) { return 0; } @@ -291,7 +291,7 @@ isSQSocketObject(sqInt objectPointer) { return ((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) + && ((byteSizeOf(objectPointer)) == (sizeof(SQSocket)))) && (!(isNullSQSocket(objectPointer))); } @@ -394,7 +394,7 @@ { sqInt exceptionWatch; sqInt fd; - usqInt flags; + sqInt flags; sqInt readWatch; sqInt writeWatch; @@ -440,7 +440,7 @@ { sqInt exceptionWatch; sqInt fd; - usqInt flags; + sqInt flags; sqInt readWatch; sqInt writeWatch; @@ -523,7 +523,7 @@ sqSocketOop = stackValue(0); if (!(((isBytes(sqSocketOop)) - && ((byteSizeOf(sqSocketOop)) == (socketRecordSize()))) + && ((byteSizeOf(sqSocketOop)) == (sizeof(SQSocket)))) && (!(isNullSQSocket(sqSocketOop))))) { return primitiveFail(); } Modified: branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-03-29 00:30:44 UTC (rev 3296) +++ branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-04-01 22:16:03 UTC (rev 3297) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 + VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec from - BalloonEnginePlugin VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 + BalloonEnginePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; @@ -836,9 +836,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.1111 (i)" + "B2DPlugin VMMaker.oscog-eem.1145 (i)" #else - "B2DPlugin VMMaker.oscog-eem.1111 (e)" + "B2DPlugin VMMaker.oscog-eem.1145 (e)" #endif ; static int* objBuffer; @@ -877,7 +877,7 @@ static sqInt aaFirstPixelFromto(sqInt leftX, sqInt rightX) { - usqInt firstPixel; + sqInt firstPixel; firstPixel = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1)); if (firstPixel > rightX) { @@ -952,8 +952,8 @@ static sqInt absoluteSquared8Dot24(sqInt value) { - usqInt word1; - usqInt word2; + sqInt word1; + sqInt word2; word1 = value & 0xFFFF; word2 = (((usqInt) value >> 16)) & 0xFF; @@ -2819,7 +2819,7 @@ sqInt bmRaster1; sqInt bmRaster2; sqInt bmWidth; - usqInt cMask; + sqInt cMask; sqInt cMask1; sqInt cMask2; sqInt cMask3; @@ -2832,7 +2832,7 @@ sqInt dtX; sqInt fillValue; sqInt firstPixel; - usqInt firstPixel1; + sqInt firstPixel1; sqInt g; sqInt g1; sqInt g2; @@ -3505,9 +3505,9 @@ { sqInt aaLevel; sqInt baseShift; - usqInt colorMask; + sqInt colorMask; sqInt firstPixel; - usqInt firstPixel1; + sqInt firstPixel1; sqInt idx; sqInt lastPixel; sqInt pv32; @@ -3635,11 +3635,11 @@ { sqInt aaLevel; sqInt baseShift; - usqInt colorMask; + sqInt colorMask; sqInt colorShift; sqInt ds; sqInt firstPixel; - usqInt firstPixel1; + sqInt firstPixel1; sqInt idx; sqInt lastPixel; sqInt rampIndex; @@ -3969,12 +3969,12 @@ { sqInt aaLevel; sqInt baseShift; - usqInt colorMask; + sqInt colorMask; sqInt colorShift; int ds; int dt; sqInt firstPixel; - usqInt firstPixel1; + sqInt firstPixel1; sqInt index; sqInt lastPixel; sqInt length2; @@ -4368,7 +4368,7 @@ int ds; int dt; sqInt firstPixel; - usqInt firstPixel1; + sqInt firstPixel1; sqInt index; sqInt lastLength; sqInt lastPixel; @@ -12279,8 +12279,8 @@ int *updateData1; sqInt viaX; sqInt viaY; - usqInt word1; - usqInt word2; + sqInt word1; + sqInt word2; sqInt xValue; @@ -13554,11 +13554,11 @@ static sqInt transformColor(sqInt fillIndex) { - usqInt a; + sqInt a; double alphaScale; - usqInt b; - usqInt g; - usqInt r; + sqInt b; + sqInt g; + sqInt r; float *transform; if (!((fillIndex == 0) @@ -13998,10 +13998,10 @@ static sqInt uncheckedTransformColor(sqInt fillIndex) { - usqInt a; - usqInt b; - usqInt g; - usqInt r; + sqInt a; + sqInt b; + sqInt g; + sqInt r; float *transform; if (!((workBuffer[GWHasColorTransform]) != 0)) { Modified: branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c =================================================================== --- branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-03-29 00:30:44 UTC (rev 3296) +++ branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-04-01 22:16:03 UTC (rev 3297) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec from - BitBltSimulation VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 + BitBltSimulation VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec */ -static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 " __DATE__ ; +static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ; @@ -344,9 +344,9 @@ }; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "BitBltPlugin VMMaker.oscog-eem.1111 (i)" + "BitBltPlugin VMMaker.oscog-eem.1145 (i)" #else - "BitBltPlugin VMMaker.oscog-eem.1111 (e)" + "BitBltPlugin VMMaker.oscog-eem.1145 (e)" #endif ; static sqInt noHalftone; @@ -439,7 +439,7 @@ alphaBlendConstwithpaintMode(unsigned int sourceWord, unsigned int destinationWord, sqInt paintMode) { sqInt bitsPerColor; - usqInt blend; + sqInt blend; unsigned int blendAG; unsigned int blendRB; unsigned int destPixVal; @@ -447,7 +447,7 @@ sqInt i; sqInt j; sqInt maskShifted; - usqInt pixBlend; + sqInt pixBlend; int pixMask; unsigned int result; sqInt rgbMask; @@ -626,8 +626,8 @@ sqInt deltaX; sqInt deltaY; sqInt destWord; - usqInt ditherBase; - usqInt ditherIndex; + sqInt ditherBase; + sqInt ditherIndex; int ditherThreshold; sqInt dstIndex; sqInt dstMask; @@ -637,7 +637,7 @@ sqInt sourceWord; sqInt srcAlpha; sqInt srcIndex; - usqInt srcShift; + sqInt srcShift; sqInt srcY; @@ -873,18 +873,18 @@ static sqInt alphaSourceBlendBits8(void) { - usqInt adjust; + sqInt adjust; sqInt deltaX; sqInt deltaY; sqInt destWord; sqInt dstIndex; - usqInt dstMask; + sqInt dstMask; sqInt dstValue; sqInt dstY; - usqInt mapperFlags; + sqInt mapperFlags; unsigned int *mappingTable; sqInt pv; - usqInt sourceWord; + sqInt sourceWord; sqInt srcAlpha; sqInt srcIndex; sqInt srcShift; @@ -1356,12 +1356,12 @@ { sqInt done; sqInt dWid; - usqInt dxLowBits; - usqInt endBits; + sqInt dxLowBits; + sqInt endBits; sqInt pixPerM1; sqInt pixPerM11; sqInt startBits; - usqInt sxLowBits; + sqInt sxLowBits; sqInt t; copyBitsRule41Test(); @@ -1693,12 +1693,12 @@ { sqInt done; sqInt dWid; - usqInt dxLowBits; - usqInt endBits; + sqInt dxLowBits; + sqInt endBits; sqInt pixPerM1; sqInt pixPerM11; sqInt startBits; - usqInt sxLowBits; + sqInt sxLowBits; sqInt t; @@ -1996,7 +1996,7 @@ sqInt notSkewMask; sqInt prevWord; sqInt skewMask; - usqInt skewWord; + sqInt skewWord; sqInt thisWord; sqInt unskew; sqInt word; @@ -2256,17 +2256,17 @@ unsigned int destPix; int destPixMask; sqInt destWord; - usqInt destWord1; - usqInt dstShift; + sqInt destWord1; + sqInt dstShift; sqInt dstShift1; sqInt dstShiftInc; sqInt dstShiftLeft; - usqInt endBits; + sqInt endBits; sqInt halftoneWord; sqInt i; sqInt idx; sqInt idx1; - usqInt mapperFlags; + sqInt mapperFlags; sqInt (*mergeFnwith)(sqInt, sqInt); sqInt mergeWord; sqInt nPix; @@ -2275,10 +2275,10 @@ sqInt pv; sqInt scrStartBits; sqInt skewWord; - usqInt sourcePix; + sqInt sourcePix; int sourcePixMask; sqInt sourceWord; - usqInt srcShift; + sqInt srcShift; sqInt srcShift1; sqInt srcShiftInc; sqInt startBits; @@ -2562,7 +2562,7 @@ static sqInt destMaskAndPointerInit(void) { - usqInt endBits; + sqInt endBits; sqInt pixPerM1; sqInt startBits; @@ -2801,7 +2801,7 @@ expensiveDither32To16threshold(sqInt srcWord, sqInt ditherValue) { int out; - usqInt pv; + sqInt pv; int threshold; int value; @@ -3008,7 +3008,7 @@ { sqInt b; int out; - usqInt pv; + sqInt pv; sqInt t; int threshold; sqInt value; @@ -3377,7 +3377,6 @@ cmSize = slotSizeOf(cmOop); cmLookupTable = firstIndexableField(cmOop); oldStyle = 1; - } else { @@ -3466,7 +3465,6 @@ else { cmFlags = cmFlags | ColorMapFixedPart; } - null; ok = 1; l4: /* end loadColorMap */; if (!ok) { @@ -3649,7 +3647,6 @@ cmSize = slotSizeOf(cmOop); cmLookupTable = firstIndexableField(cmOop); oldStyle = 1; - } else { @@ -3735,7 +3732,6 @@ else { cmFlags = cmFlags | ColorMapFixedPart; } - null; return 1; } @@ -4005,7 +4001,7 @@ static sqInt OLDrgbDiffwith(sqInt sourceWord, sqInt destinationWord) { - usqInt diff; + sqInt diff; int pixMask; if (destDepth < 16) { @@ -4050,17 +4046,16 @@ sqInt d; sqInt d1; sqInt d2; - usqInt destPix; - usqInt destPix1; - usqInt destPix2; + sqInt destPix; + sqInt destPix1; + sqInt destPix2; sqInt i; - usqInt mapIndex; + sqInt mapIndex; sqInt mask; sqInt mask3; sqInt mask4; - unsigned int pixMask; + int pixMask; sqInt shiftWord; - sqInt sourcePixel; sqInt srcPix; sqInt srcPix1; sqInt srcPix2; @@ -4086,7 +4081,6 @@ /* Two pixels Tally the right half... */ /* begin rgbMap:from:to: */ - sourcePixel = destinationWord & 0xFFFF; if (((d = cmBitsPerColor - 5)) > 0) { /* Expand to more bits by zero-fill */ @@ -4095,12 +4089,12 @@ /* Transfer mask */ mask = (1 << 5) - 1; - srcPix = sourcePixel << d; + srcPix = (destinationWord & 0xFFFF) << d; mask = mask << d; destPix = srcPix & mask; mask = mask << cmBitsPerColor; srcPix = srcPix << d; - mapIndex = ((sqInt) ((destPix + (srcPix & mask)) + ((srcPix << d) & (mask << cmBitsPerColor)))); + mapIndex = (destPix + (srcPix & mask)) + ((srcPix << d) & (mask << cmBitsPerColor)); goto l1; } else { @@ -4113,7 +4107,7 @@ /* Sometimes called with 16 bits, though pixel is 15, but we must never return more than 15. */ - mapIndex = ((sqInt) (sourcePixel & 0x7FFF)); + mapIndex = (destinationWord & 0xFFFF) & 0x7FFF; goto l1; } if (5 == 8) { @@ -4121,14 +4115,14 @@ /* Sometimes called with 32 bits, though pixel is 24, but we must never return more than 24. */ - mapIndex = ((sqInt) (sourcePixel & 0xFFFFFF)); + mapIndex = (destinationWord & 0xFFFF) & 0xFFFFFF; goto l1; } - mapIndex = sourcePixel; + mapIndex = destinationWord & 0xFFFF; goto l1; } - if (sourcePixel == 0) { - mapIndex = sourcePixel; + if ((destinationWord & 0xFFFF) == 0) { + mapIndex = destinationWord & 0xFFFF; goto l1; } d = 5 - cmBitsPerColor; @@ -4136,7 +4130,7 @@ /* Transfer mask */ mask = (1 << cmBitsPerColor) - 1; - srcPix = ((usqInt) sourcePixel) >> d; + srcPix = ((usqInt) (destinationWord & 0xFFFF)) >> d; @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: BytecodeSets.spur-cb.26.mcz
by commits＠source.squeak.org 02 Apr '15

02 Apr '15

ClementBera uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-cb.26.mcz ==================== Summary ==================== Name: BytecodeSets.spur-cb.26 Author: cb Time: 1 April 2015, 3:15:17.26 pm UUID: e8021f4f-83d5-43b0-bb3d-4fc31d02c74f Ancestors: BytecodeSets.spur-cb.25 fixed instructionStream so Decompiler can work fine with SistaV1 methods. Seemingly the decompiler finds out that both V3PlusClosure and SistaV1 have the same bytecodes now. Therefore I think the image does not run because of VM-side bug. =============== Diff against BytecodeSets.spur-cb.25 =============== Item was changed: ----- Method: InstructionStream>>interpretNext2ByteSistaV1Instruction:for:extA:extB:startPC: (in category '*BytecodeSets-SistaV1-decoding') ----- interpretNext2ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC "Send to the argument, client, a message that specifies the next instruction. This method handles the two-byte codes. For a table of the bytecode set, see EncoderForV1's class comment." | byte method | method := self method. byte := self method at: pc. pc := pc + 1. "We do an inline quasi-binary search on bytecode" bytecode < 234 ifTrue: "pushes" [bytecode < 231 ifTrue: [bytecode < 229 ifTrue: [| literal | bytecode = 226 ifTrue: [^client pushReceiverVariable: (extA bitShift: 8) + byte]. literal := method literalAt: (extA bitShift: 8) + byte + 1. bytecode = 227 ifTrue: [^client pushLiteralVariable: literal]. ^client pushConstant: literal]. bytecode = 229 ifTrue: + [^client pushTemporaryVariable: byte]. + ^client pushClosureTemps: byte]. - [^client pushClosureTemps: byte]. - ^client pushTemporaryVariable: byte]. bytecode = 231 ifTrue: [^byte < 128 ifTrue: [client pushNewArrayOfSize: byte] ifFalse: [client pushConsArrayWithElements: byte - 128]]. bytecode = 232 ifTrue: [^client pushConstant: (extB bitShift: 8) + byte]. ^client pushConstant: (Character value: (extB bitShift: 8) + byte)]. bytecode < 240 ifTrue: "sends, trap and jump" [bytecode < 236 ifTrue: "sends" [^client send: (method literalAt: (extA bitShift: 5) + (byte // 8) + 1) super: bytecode = 235 numArgs: (extB bitShift: 3) + (byte \\ 8)]. bytecode = 236 ifTrue: [^client trapIfNotInstanceOf: (method literalAt: (extA bitShift: 8) + byte + 1)]. bytecode = 237 ifTrue: [^client jump: (extB bitShift: 8) + byte]. ^client jump: (extB bitShift: 8) + byte if: bytecode = 238]. bytecode < 243 ifTrue: [bytecode = 240 ifTrue: [^client popIntoReceiverVariable: (extA bitShift: 8) + byte]. bytecode = 241 ifTrue: [^client popIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. ^client popIntoTemporaryVariable: byte]. bytecode = 243 ifTrue: [^client storeIntoReceiverVariable: (extA bitShift: 8) + byte]. bytecode = 244 ifTrue: [^client storeIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. bytecode = 245 ifTrue: [^client storeIntoTemporaryVariable: byte]. "246-247 1111011 i xxxxxxxx UNASSIGNED" ^self unusedBytecode: client at: startPC! Item was changed: ----- Method: InstructionStream>>interpretNext3ByteSistaV1Instruction:for:extA:extB:startPC: (in category '*BytecodeSets-SistaV1-decoding') ----- interpretNext3ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC "Send to the argument, client, a message that specifies the next instruction. This method handles the three-byte codes. For a table of the bytecode set, see EncoderForSistaV1's class comment." | method byte2 byte3 | method := self method. byte2 := method at: pc. byte3 := method at: pc + 1. pc := pc + 2. "we search the bytecodes by what we expect to be the static frequency." bytecode = 248 ifTrue: [^client callPrimitive: byte2 + (byte3 bitShift: 8)]. bytecode = 250 ifTrue: ["** 250 11111010 eeiiikkk jjjjjjjj Push Closure Num Copied iii (+ExtA//16*8) Num Args kkk (+ ExtA\\16*8) BlockSize jjjjjjjj (+ExtB*256). ee = num extensions" ^client pushClosureCopyNumCopiedValues: ((byte2 bitShift: -3) bitAnd: 7) + (extA // 16 bitShift: 3) numArgs: (byte2 bitAnd: 7) + (extA \\ 16 bitShift: 3) blockSize: byte3 + (extB bitShift: 8)]. bytecode = 251 ifTrue: [^client pushRemoteTemp: byte2 inVectorAt: byte3]. bytecode = 252 ifTrue: - [^client popIntoRemoteTemp: byte2 inVectorAt: byte3]. - bytecode = 253 ifTrue: [^client storeIntoRemoteTemp: byte2 inVectorAt: byte3]. + bytecode = 253 ifTrue: + [^client popIntoRemoteTemp: byte2 inVectorAt: byte3]. "249 11111001 xxxxxxxx syyyyyyy Reserved for Push Float" "254-255 1111111 i xxxxxxxx yyyyyyyy UNASSIGNED" ^self unusedBytecode: client at: startPC!

1 0

VM Maker: VMMaker.oscog-eem.1147.mcz
by commits＠source.squeak.org 01 Apr '15

01 Apr '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1147.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1147 Author: eem Time: 1 April 2015, 2:52:03.518 pm UUID: 0fd3920d-c904-484f-b436-e6563dce31c2 Ancestors: VMMaker.oscog-eem.1146 Spur: Make sure that all stacked values are followed in CoInterpreter>>makeBaseFrameFor: Newspeak: Unstub ceSelfSend:to:numArgs:. Nuke the obsolete NewspeakV3PlusClosures bytecode table initializers. Eliminate some compiler warnings. =============== Diff against VMMaker.oscog-eem.1146 =============== Item was changed: ----- Method: CoInterpreter>>ceSelfSend:to:numArgs: (in category 'trampolines') ----- ceSelfSend: selector to: rcvr numArgs: numArgs "Entry-point for an unlinked self send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> <option: #NewspeakVM> | classTag errSelIdx cogMethod | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> - true ifTrue: [^self ceSend: selector super: 0 to: rcvr numArgs: numArgs]. "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. classTag := objectMemory fetchClassTagOf: rcvr. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [(objectMemory isOopForwarded: selector) ifTrue: [^self ceSelfSend: (self handleForwardedSelectorFaultFor: selector) to: rcvr numArgs: numArgs]. (objectMemory isForwardedClassTag: classTag) ifTrue: [^self ceSelfSend: selector to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc") numArgs: numArgs]. messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. cogMethod selector = selector ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: cogit selfSendEntryOffset receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>followForwardingPointersInStackZone: (in category 'object memory support') ----- followForwardingPointersInStackZone: theBecomeEffectsFlags "Spur's become: is lazy, turning the becommed object into a forwarding object to the other. The read-barrier is minimised by arranging that forwarding pointers will fail a method cache probe, since notionally objects' internals are accessed only via sending messages to them, the exception is primitives that access the internals of the non-receiver argument(s). To avoid a read barrier on inst var fetch we scan the receivers in the stack zone and follow any forwarded ones. This is way cheaper than scanning all of memory as in the old become. Override to handle machine code frames, and to handle the lack of an explicit read barrier on super sends. With most super send implementations (not Newspeak's absent super bytecodes) self, the receiver of the super send, is pushed before any arguments. So if self is becommed during argument marshalling, e.g. super doSomethingWith: (self become: self somethingElse) then a stale forwarded reference to self could be left on the stack. In the StackInterpreter we deal with this with an explicit read barrier on supersend. In the CoInterpreter we deal with it by following all non-argument stack contents." | theIPPtr | <inline: false> <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> <var: #theFP type: #'char *'> + <var: #offset type: #'char *'> <var: #callerFP type: #'char *'> <var: #theIPPtr type: #usqInt> self externalWriteBackHeadFramePointers. (theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [(objectMemory isForwarded: method) ifTrue: [theIPPtr := instructionPointer - method. method := objectMemory followForwarded: method. instructionPointer := method + theIPPtr]. (objectMemory isOopForwarded: newMethod) ifTrue: [newMethod := objectMemory followForwarded: newMethod]]. self assert: stackPage ~= 0. 0 to: numStackPages - 1 do: [:i| | thePage theSP theFP callerFP oop offset | thePage := stackPages stackPageAt: i. thePage isFree ifFalse: [theSP := thePage headSP. theFP := thePage headFP. "Skip the instruction pointer on top of stack of inactive pages." thePage = stackPage ifTrue: [theIPPtr := 0] ifFalse: [theIPPtr := theSP asUnsignedInteger. theSP := theSP + objectMemory wordSize]. [self assert: (thePage addressIsInPage: theFP). self assert: (theIPPtr = 0 or: [thePage addressIsInPage: theIPPtr asVoidPointer]). offset := self frameStackedReceiverOffset: theFP. [theSP <= offset] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]. ((self frameHasContext: theFP) and: [(objectMemory isForwarded: (self frameContext: theFP))]) ifTrue: [stackPages longAt: theFP + FoxThisContext put: (objectMemory followForwarded: (self frameContext: theFP))]. (self isMachineCodeFrame: theFP) ifTrue: [oop := stackPages longAt: theFP + FoxMFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxMFReceiver put: (objectMemory followForwarded: oop)]. oop := (self mframeHomeMethod: theFP) methodObject. self assert: (objectMemory isForwarded: oop) not] ifFalse: [oop := stackPages longAt: theFP + FoxIFReceiver. (objectMemory isOopForwarded: oop) ifTrue: [stackPages longAt: theFP + FoxIFReceiver put: (objectMemory followForwarded: oop)]. oop := self iframeMethod: theFP. (objectMemory isForwarded: oop) ifTrue: [| newOop delta | newOop := objectMemory followForwarded: oop. delta := newOop - oop. (theIPPtr ~= 0 and: [(stackPages longAt: theIPPtr) > oop]) ifTrue: [stackPages longAt: theIPPtr put: (stackPages longAt: theIPPtr) + delta]. stackPages longAt: theFP + FoxIFSavedIP put: (stackPages longAt: theFP + FoxIFSavedIP) + delta. stackPages longAt: theFP + FoxMethod put: (oop := newOop)]]. (callerFP := self frameCallerFP: theFP) ~= 0] whileTrue: [theIPPtr := (theFP + FoxCallerSavedIP) asUnsignedInteger. theSP := theIPPtr + objectMemory wordSize. theFP := callerFP]. "And finally follow the saved context and the caller context." theSP := thePage baseAddress - objectMemory wordSize. [theSP <= thePage baseAddress] whileTrue: [oop := stackPages longAt: theSP. (objectMemory isForwarded: oop) ifTrue: [stackPages longAt: theSP put: (objectMemory followForwarded: oop)]. theSP := theSP + objectMemory wordSize]]]! Item was changed: ----- Method: CoInterpreter>>makeBaseFrameFor: (in category 'frame access') ----- makeBaseFrameFor: aContext "<Integer>" "Marry aContext with the base frame of a new stack page. Build the base frame to reflect the context's state. Answer the new page. Override to hold the caller context in a different place, In the StackInterpreter we use the caller saved ip, but in the Cog VM caller saved ip is the ceBaseReturn: trampoline. Simply hold the caller context in the first word of the stack." <returnTypeC: #'StackPage *'> | page pointer theMethod theIP numArgs stackPtrIndex maybeClosure rcvr | <inline: false> <var: #page type: #'StackPage *'> <var: #pointer type: #'char *'> <var: #cogMethod type: #'CogMethod *'> "theIP must be typed as signed because it is assigned ceCannotResumePC and so maybe implicitly typed as unsigned." <var: #theIP type: #sqInt> self assert: (objectMemory isContext: aContext). self assert: (self isSingleContext: aContext). self assert: (objectMemory goodContextSize: aContext). theIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. self assert: HasBeenReturnedFromMCPC signedIntFromLong < 0. theIP := (objectMemory isIntegerObject: theIP) ifTrue: [objectMemory integerValueOf: theIP] ifFalse: [HasBeenReturnedFromMCPC]. theMethod := objectMemory followObjField: MethodIndex ofObject: aContext. page := self newStackPage. "first word on stack is caller context of base frame" stackPages longAt: (pointer := page baseAddress) + put: (objectMemory followObjField: SenderIndex ofObject: aContext). - put: (objectMemory fetchPointer: SenderIndex ofObject: aContext). "second word is the context itself; needed for cannotReturn processing; see ceBaseReturn:." stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. rcvr := objectMemory followField: ReceiverIndex ofObject: aContext. "If the frame is a closure activation then the closure should be on the stack in the pushed receiver position (closures receiver the value[:value:] messages). Otherwise it should be the receiver proper." maybeClosure := objectMemory fetchPointer: ClosureIndex ofObject: aContext. maybeClosure ~= objectMemory nilObject ifTrue: [numArgs := self argumentCountOfClosure: maybeClosure. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: maybeClosure] ifFalse: [| header | header := objectMemory methodHeaderOf: theMethod. numArgs := self argumentCountOfMethodHeader: header. "If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it." (theIP signedIntFromLong > 0 and: [(self methodHeaderHasPrimitive: header) and: [theIP = (1 + (objectMemory lastPointerOfMethodHeader: header))]]) ifTrue: [theIP := theIP + (self sizeOfCallPrimitiveBytecode: header)]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr]. "Put the arguments on the stack" 1 to: numArgs do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "saved caller ip is base return trampoline" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: cogit ceBaseFrameReturnPC. "base frame's saved fp is null" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. "N.B. Don't set the baseFP, which marks the page as in use, until after ensureMethodIsCogged: and/or instructionPointer:forContext:frame:. These can cause a compiled code compaction which, if marked as in use, will examine this partially initialized page and crash." page headFP: pointer. "Create either a machine code frame or an interpreter frame based on the pc. If the pc is -ve it is a machine code pc and so we produce a machine code frame. If +ve an interpreter frame. N.B. Do *not* change this to try and map from a bytecode pc to a machine code frame under any circumstances. See ensureContextIsExecutionSafeAfterAssignToStackPointer:" theIP signedIntFromLong < 0 ifTrue: [| cogMethod | "Since we would have to generate a machine-code method to be able to map the native pc anyway we should create a native method and native frame." cogMethod := self ensureMethodIsCogged: theMethod. theMethod := cogMethod asInteger. maybeClosure ~= objectMemory nilObject ifTrue: ["If the pc is the special HasBeenReturnedFromMCPC pc set the pc appropriately so that the frame stays in the cannotReturn: state." theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [theMethod := (cogit findMethodForStartBcpc: (self startPCOfClosure: maybeClosure) inHomeMethod: (self cCoerceSimple: theMethod to: #'CogMethod *')) asInteger. theMethod = 0 ifTrue: [self error: 'cannot find machine code block matching closure''s startpc']. theIP := cogit ceCannotResumePC] ifFalse: [self assert: (theIP signedBitShift: -16) < -1. "See contextInstructionPointer:frame:" theMethod := theMethod - ((theIP signedBitShift: -16) * cogit blockAlignment). theIP := theMethod - theIP signedIntFromShort]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod + MFMethodFlagHasContextFlag + MFMethodFlagIsBlockFlag] ifFalse: [self assert: (theIP signedBitShift: -16) >= -1. "If the pc is the special HasBeenReturnedFromMCPC pc set the pc appropriately so that the frame stays in the cannotReturn: state." theIP := theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [cogit ceCannotResumePC] ifFalse: [theMethod asInteger - theIP]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod + MFMethodFlagHasContextFlag]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext] ifFalse: [stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs). stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. "FoxIFSavedIP" theIP := self iframeInstructionPointerForIndex: theIP method: theMethod]. page baseFP: page headFP. self assert: (self frameHasContext: page baseFP). self assert: (self frameNumArgs: page baseFP) == numArgs. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr. stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext. self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext). + "Copy the non-argument temps and stack contents to the stack. + Follow these to avoid any stale self references from super sends." numArgs + 1 to: stackPtrIndex do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) + put: (objectMemory followField: ReceiverIndex + i ofObject: aContext)]. - put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "top of stack is the instruction pointer" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theIP. page headSP: pointer. self assert: (self context: aContext hasValidInversePCMappingOf: theIP in: page baseFP). "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity) plus SmallInteger tags." objectMemory storePointerUnchecked: SenderIndex ofObject: aContext withValue: (self withSmallIntegerTags: page baseFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: aContext withValue: (self withSmallIntegerTags: 0). self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)). self assert: (self frameOfMarriedContext: aContext) = page baseFP. self assert: (self validStackPageBaseFrame: page). ^page! Item was changed: ----- Method: Cogit class>>initializeBytecodeTable (in category 'class initialization') ----- initializeBytecodeTable "SimpleStackBasedCogit initializeBytecodeTableWith: Dictionary new" "StackToRegisterMappingCogit initializeBytecodeTableWith: Dictionary new" | initializer | initializer := initializationOptions at: #bytecodeTableInitializer ifAbsent: [NewspeakVM ifTrue: + [MULTIPLEBYTECODESETS + ifTrue: [#initializeBytecodeTableForSqueakV3PlusClosuresNewspeakV4Hybrid] + ifFalse: [#initializeBytecodeTableForNewspeakV4]] - [(initializationOptions at: #SpurObjectMemory ifAbsent: false) - ifTrue: - [MULTIPLEBYTECODESETS - ifTrue: [#initializeBytecodeTableForSqueakV3PlusClosuresNewspeakV4Hybrid] - ifFalse: [#initializeBytecodeTableForNewspeakV4]] - ifFalse: - [MULTIPLEBYTECODESETS - ifTrue: [#initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid] - ifFalse: [#initializeBytecodeTableForNewspeakV3PlusClosures]]] ifFalse: [#initializeBytecodeTableForSqueakV3PlusClosures]]. "Now make sure all classes in the hierarchy have initialized to the same bytecode table." (self withAllSuperclasses copyUpTo: Cogit) reverseDo: "i.e. exclude Cogit" [:cogitClass| cogitClass perform: initializer]! Item was removed: - ----- Method: Cogit class>>initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid (in category 'class initialization') ----- - initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid - "SimpleStackBasedCogit initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid" - "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid" - - | v3Table v4Table | - "N.B. Must do it backwards to evaluate AltBlockCreationBytecodeSize & BlockCreationBytecodeSize et al correctly." - self initializeBytecodeTableForNewspeakV4. - v4Table := generatorTable. - AltBlockCreationBytecodeSize := BlockCreationBytecodeSize. - AltNSSendIsPCAnnotated := NSSendIsPCAnnotated. - AltFirstSpecialSelector := FirstSpecialSelector. - self initializeBytecodeTableForNewspeakV3PlusClosures. - v3Table := generatorTable. - generatorTable := CArrayAccessor on: v3Table object, v4Table object! Item was changed: ----- Method: Cogit>>genEnilopmartFor:and:and:forCall:called: (in category 'initialization') ----- genEnilopmartFor: regArg1 and: regArg2 and: regArg3 forCall: forCall called: trampolineName "An enilopmart (the reverse of a trampoline) is a piece of code that makes the system-call-like transition from the C runtime into generated machine code. The desired arguments and entry-point are pushed on a stackPage's stack. The enilopmart pops off the values to be loaded into registers and then executes a return instruction to pop off the entry-point and jump to it. BEFORE AFTER (stacks grow down) whatever stackPointer -> whatever target address => reg1 = reg1val, etc reg1val pc = target address reg2val stackPointer -> reg3val" + + <var: #trampolineName type: #'char *'> <returnTypeC: #'void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2, sqInt regArg3, sqInt forCall, sqInt trampolineName))(void)'> + | size endAddress enilopmart | opcodeIndex := 0. backEnd maybeEstablishVarBase. "Must happen first; value may be used in genLoadStackPointers" backEnd genLoadStackPointers. regArg3 ifNotNil: [self PopR: regArg3]. regArg2 ifNotNil: [self PopR: regArg2]. self PopR: regArg1. self genEnilopmartReturn: forCall. self computeMaximumSizes. size := self generateInstructionsAt: methodZoneBase. endAddress := self outputInstructionsAt: methodZoneBase. self assert: methodZoneBase + size = endAddress. enilopmart := methodZoneBase. methodZoneBase := self alignUptoRoutineBoundary: endAddress. backEnd nopsFrom: endAddress to: methodZoneBase - 1. self recordGeneratedRunTime: trampolineName address: enilopmart. ^self cCoerceSimple: enilopmart to: #'void (*)(void)'! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTable (in category 'initialization') ----- initializeBytecodeTable "StackInterpreter initializeBytecodeTable" (initializationOptions at: #bytecodeTableInitializer ifAbsent: nil) ifNotNil: [:initalizer| ^self perform: initalizer]. NewspeakVM ifTrue: + [^MULTIPLEBYTECODESETS + ifTrue: [self initializeBytecodeTableForSqueakV3PlusClosuresNewspeakV4Hybrid] + ifFalse: [self initializeBytecodeTableForNewspeakV4]]. - [^(initializationOptions at: #SpurObjectMemory ifAbsent: false) - ifTrue: - [MULTIPLEBYTECODESETS - ifTrue: [self initializeBytecodeTableForSqueakV3PlusClosuresNewspeakV4Hybrid] - ifFalse: [self initializeBytecodeTableForNewspeakV4]] - ifFalse: - [MULTIPLEBYTECODESETS - ifTrue: [self initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid] - ifFalse: [self initializeBytecodeTableForNewspeakV3PlusClosures]]]. ^self initializeBytecodeTableForSqueakV3PlusClosures! Item was removed: - ----- Method: StackInterpreter class>>initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid (in category 'initialization') ----- - initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid - "StackInterpreter initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid" - - | v3Table v4Table | - self initializeBytecodeTableForNewspeakV4. - v4Table := BytecodeTable. - AltBytecodeEncoderClassName := BytecodeEncoderClassName. - AltLongStoreBytecode := LongStoreBytecode. - self initializeBytecodeTableForNewspeakV3PlusClosures. - v3Table := BytecodeTable. - BytecodeTable := v3Table, v4Table! Item was changed: ----- Method: StackInterpreter>>makeBaseFrameFor: (in category 'frame access') ----- makeBaseFrameFor: aContext "<Integer>" "Marry aContext with the base frame of a new stack page. Build the base frame to reflect the context's state. Answer the new page." <returnTypeC: #'StackPage *'> | page pointer theMethod theIP numArgs stackPtrIndex maybeClosure rcvr | <inline: false> <var: #page type: #'StackPage *'> <var: #pointer type: #'char *'> self assert: (objectMemory isContext: aContext). self assert: (self isSingleContext: aContext). self assert: (objectMemory goodContextSize: aContext). page := self newStackPage. pointer := page baseAddress. theIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. theMethod := objectMemory followObjField: MethodIndex ofObject: aContext. (objectMemory isIntegerObject: theIP) ifFalse: [self error: 'context is not resumable']. theIP := objectMemory integerValueOf: theIP. rcvr := objectMemory followField: ReceiverIndex ofObject: aContext. "If the frame is a closure activation then the closure should be on the stack in the pushed receiver position (closures receiver the value[:value:] messages). Otherwise it should be the receiver proper." maybeClosure := objectMemory followField: ClosureIndex ofObject: aContext. maybeClosure ~= objectMemory nilObject ifTrue: [numArgs := self argumentCountOfClosure: maybeClosure. stackPages longAt: pointer put: maybeClosure] ifFalse: [| header | header := objectMemory methodHeaderOf: theMethod. numArgs := self argumentCountOfMethodHeader: header. "If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it." (theIP signedIntFromLong > 0 and: [(self methodHeaderHasPrimitive: header) and: [theIP = (1 + (objectMemory lastPointerOfMethodHeader: header))]]) ifTrue: [theIP := theIP + (self sizeOfCallPrimitiveBytecode: header)]. stackPages longAt: pointer put: rcvr]. "Put the arguments on the stack" 1 to: numArgs do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "saved caller ip is sender context in base frame" stackPages longAt: (pointer := pointer - objectMemory wordSize) + put: (objectMemory followObjField: SenderIndex ofObject: aContext). - put: (objectMemory fetchPointer: SenderIndex ofObject: aContext). "base frame's saved fp is null" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. page baseFP: pointer; headFP: pointer. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs). self assert: (self frameHasContext: page baseFP). self assert: (self frameNumArgs: page baseFP) == numArgs. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr. stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext. self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext). numArgs + 1 to: stackPtrIndex do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "top of stack is the instruction pointer" theIP := self iframeInstructionPointerForIndex: theIP method: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theIP. page headSP: pointer. self assert: (self context: aContext hasValidInversePCMappingOf: theIP in: page baseFP). "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity) plus SmallInteger tags." objectMemory storePointerUnchecked: SenderIndex ofObject: aContext withValue: (self withSmallIntegerTags: page baseFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: aContext withValue: (self withSmallIntegerTags: 0). self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)). self assert: (self frameOfMarriedContext: aContext) = page baseFP. self assert: (self validStackPageBaseFrame: page). ^page! Item was removed: - ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid (in category 'class initialization') ----- - initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid - "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid" - - super initializeBytecodeTableForNewspeakV3PlusClosuresNewspeakV4Hybrid. - numPushNilsFunction := #v3or4:Num:Push:Nils:. - pushNilSizeFunction := #v3or4PushNilSize:!

1 0

VM Maker: BytecodeSets.spur-cb.25.mcz
by commits＠source.squeak.org 01 Apr '15

01 Apr '15

ClementBera uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-cb.25.mcz ==================== Summary ==================== Name: BytecodeSets.spur-cb.25 Author: cb Time: 1 April 2015, 2:14:33.53 pm UUID: 2e129070-202a-4aa4-ad8a-a82f0a522a90 Ancestors: BytecodeSets.spur-cb.24 - Bytecode for push true and push false were inverted. - fix two bugs in sistaV1 bytecode decoding. =============== Diff against BytecodeSets.spur-cb.24 =============== Item was changed: ----- Method: EncoderForSistaV1>>genPushSpecialLiteral: (in category 'bytecode generation') ----- genPushSpecialLiteral: aLiteral "77 01001101 Push true 78 01001110 Push false 79 01001111 Push nil 80 01010000 Push 0 81 01010001 Push 1 232 11101000 iiiiiiii Push Integer #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1)" | index | aLiteral isInteger ifTrue: [aLiteral == 0 ifTrue: [stream nextPut: 80. ^self]. aLiteral == 1 ifTrue: [stream nextPut: 81. ^self]. ^self genPushInteger: aLiteral]. + index := #(true false nil) - index := #(false true nil) indexOf: aLiteral ifAbsent: [^self error: 'push special literal: ', aLiteral printString, ' is not one of true false nil']. stream nextPut: 76 + index! Item was changed: ----- Method: InstructionStream>>interpretNext2ByteSistaV1Instruction:for:extA:extB:startPC: (in category '*BytecodeSets-SistaV1-decoding') ----- interpretNext2ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC "Send to the argument, client, a message that specifies the next instruction. This method handles the two-byte codes. For a table of the bytecode set, see EncoderForV1's class comment." | byte method | method := self method. byte := self method at: pc. pc := pc + 1. "We do an inline quasi-binary search on bytecode" bytecode < 234 ifTrue: "pushes" [bytecode < 231 ifTrue: [bytecode < 229 ifTrue: [| literal | bytecode = 226 ifTrue: [^client pushReceiverVariable: (extA bitShift: 8) + byte]. literal := method literalAt: (extA bitShift: 8) + byte + 1. bytecode = 227 ifTrue: [^client pushLiteralVariable: literal]. ^client pushConstant: literal]. bytecode = 229 ifTrue: [^client pushClosureTemps: byte]. ^client pushTemporaryVariable: byte]. bytecode = 231 ifTrue: [^byte < 128 ifTrue: [client pushNewArrayOfSize: byte] ifFalse: [client pushConsArrayWithElements: byte - 128]]. bytecode = 232 ifTrue: [^client pushConstant: (extB bitShift: 8) + byte]. ^client pushConstant: (Character value: (extB bitShift: 8) + byte)]. bytecode < 240 ifTrue: "sends, trap and jump" [bytecode < 236 ifTrue: "sends" [^client send: (method literalAt: (extA bitShift: 5) + (byte // 8) + 1) + super: bytecode = 235 - super: bytecode = 239 numArgs: (extB bitShift: 3) + (byte \\ 8)]. bytecode = 236 ifTrue: [^client trapIfNotInstanceOf: (method literalAt: (extA bitShift: 8) + byte + 1)]. bytecode = 237 ifTrue: [^client jump: (extB bitShift: 8) + byte]. ^client jump: (extB bitShift: 8) + byte if: bytecode = 238]. bytecode < 243 ifTrue: [bytecode = 240 ifTrue: [^client popIntoReceiverVariable: (extA bitShift: 8) + byte]. bytecode = 241 ifTrue: [^client popIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. ^client popIntoTemporaryVariable: byte]. bytecode = 243 ifTrue: [^client storeIntoReceiverVariable: (extA bitShift: 8) + byte]. bytecode = 244 ifTrue: [^client storeIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)]. bytecode = 245 ifTrue: [^client storeIntoTemporaryVariable: byte]. "246-247 1111011 i xxxxxxxx UNASSIGNED" ^self unusedBytecode: client at: startPC! Item was changed: ----- Method: InstructionStream>>interpretNextSistaV1InstructionFor: (in category '*BytecodeSets-SistaV1-decoding') ----- interpretNextSistaV1InstructionFor: client "Send to the argument, client, a message that specifies the next instruction." | byte div16 offset method extA extB savedPC | method := self method. "For a table of the bytecode set, see EncoderForSistaV1's class comment." "consume and compute any extensions first." extA := extB := 0. savedPC := pc. [byte := self method at: pc. pc := pc + 1. byte >= 16rE0 and: [byte <= 16rE1]] whileTrue: [| extByte | extByte := self method at: pc. pc := pc + 1. byte = 16rE0 ifTrue: [extA := (extA bitShift: 8) + extByte] ifFalse: [extB := (extB = 0 and: [extByte > 127]) ifTrue: [extByte - 256] ifFalse: [(extB bitShift: 8) + extByte]]]. div16 := byte // 16. offset := byte \\ 16. "We do an inline quasi-binary search on each of the possible 16 values of div16" div16 < 11 ifTrue: [div16 < 6 ifTrue: [div16 < 4 ifTrue: [div16 < 2 ifTrue: [div16 = 0 ifTrue: [^client pushReceiverVariable: offset]. ^client pushLiteralVariable: (method literalAt: offset + 1)]. "div16 = 1" ^client pushConstant: (method literalAt: byte \\ 32 + 1)]. div16 = 4 ifTrue: [offset < 12 ifTrue: [^client pushTemporaryVariable: offset]. offset = 12 ifTrue: [^client pushReceiver]. offset = 13 ifTrue: [^client pushConstant: true]. offset = 14 ifTrue: [^client pushConstant: false]. offset = 15 ifTrue: [^client pushConstant: nil]]. "div16 = 5" offset < 2 ifTrue: [^client pushConstant: offset]. offset = 2 ifTrue: [^self interpretSistaV1ExtendedPush: extB for: client]. offset = 3 ifTrue: [^client doDup]. offset = 8 ifTrue: [^client methodReturnReceiver]. offset = 9 ifTrue: [^client methodReturnConstant: true]. offset = 10 ifTrue: [^client methodReturnConstant: false]. offset = 11 ifTrue: [^client methodReturnConstant: nil]. offset = 12 ifTrue: [^client methodReturnTop]. offset = 13 ifTrue: [^client blockReturnConstant: nil]. offset = 14 ifTrue: [^client blockReturnTop]. offset = 15 ifTrue: [^client doNop]. ^self unusedBytecode: client at: savedPC]. "short sends" div16 = 6 ifTrue: [^client send: (Smalltalk specialSelectorAt: offset + 1) super: false numArgs: (Smalltalk specialNargsAt: offset + 1)]. div16 = 7 ifTrue: [^client send: (Smalltalk specialSelectorAt: offset + 17) super: false numArgs: (Smalltalk specialNargsAt: offset + 17)]. ^client send: (method literalAt: offset + 1) super: false numArgs: div16 - 8]. "div16 >= 11; bytecode >= 176" div16 < 14 ifTrue: [div16 = 11 ifTrue: [offset < 8 ifTrue: [^client jump: offset + 1]. ^client jump: offset - 7 if: true]. div16 = 12 ifTrue: [offset < 8 ifTrue: [^client jump: offset + 1 if: false]. ^client popIntoReceiverVariable: offset - 8]. "div16 = 13" offset < 8 ifTrue: [^client popIntoTemporaryVariable: offset]. + offset = 8 ifTrue: [ ^ client doPop ]. - offset = 9 ifTrue: - [^client doDup]. ^self unusedBytecode: client at: savedPC]. "2 byte and 3 byte codes" byte < 248 ifTrue: [^self interpretNext2ByteSistaV1Instruction: byte for: client extA: extA extB: extB startPC: savedPC]. ^self interpretNext3ByteSistaV1Instruction: byte for: client extA: extA extB: extB startPC: savedPC!

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2015