Vm-dev January 2016

vm-dev@lists.squeakfoundation.org

40 participants
156 discussions

Differentiate ProcessList and LinkedList - incomplete
by Ben Coman 10 Jan '16

10 Jan '16

LinkedList is a generic concept but historically has been intimately coupled to Process scheduling. While trying to make LinkedList API more generic, Pharo inadvertently introduced some problems with Processes, so we decided to copy LinkedList to ProcessList so this can remain specialised for Process scheduling, allowing LinkedList the opportunity to be more generic. Here is some history at fogbugz.pharo.com: Background... Case 5602 "LinkedList at: index putLink: aLink" Case 10273 "Cleaning Linked List API" Changes... Case 15868 "Differentiate ProcessList and LinkedList" Case 15871 "enable ProcessList" Case 17277 "newSpecialObjectsArray should return a process list instead of a linked list at item 41" Semaphore rather intimately manipulates the process list, but it seems to have been missed as it still inherits from LinkedList. Should it subclass ProcessList instead? I guess FreeTypeCacheLinkedList and Stack can remain where they are. So also a question for the Squeak, Cuis & Newspeak communities... There are various references to LinkedList in the VM [1]. Currently only in comments but there are hints down the track there could be more direct use. So I am wondering how these groups would feel about aligning with Pharo on this change, so the comments in the VM can be updated accordingly? cheers -ben [1] https://git.io/vuQQk

3 2

Why StandardFileStream fileID is 16 bytes in Linux while 20 bytes in OSX?
by Mariano Martinez Peck 10 Jan '16

10 Jan '16

Hi guys, In OSX, StandardFileStream byteID size is 20, while in Linux, it is 16. I see this definition in ./Cross/plugins/FilePlugin/FilePlugin.h /* squeak file record; see sqFilePrims.c for details */ typedef struct { int sessionID; /* ikp: must be first */ void *file; squeakFileOffsetType fileSize; /* 64-bits we hope. */ #if defined(ACORN) // ACORN has to have 'lastOp' as at least a 32 bit field in order to work int lastOp; // actually used to save file position char writable; char lastChar; char isStdioStream; #else char writable; char lastOp; /* 0 = uncommitted, 1 = read, 2 = write */ char lastChar; char isStdioStream; #endif } SQFile; And I see no override from UNIX platform code. So...how can that be 16 bytes in Linux? Thanks in advance, -- Mariano http://marianopeck.wordpress.com

4 9

VM Maker: Cog-eem.312.mcz
by commits＠source.squeak.org 10 Jan '16

10 Jan '16

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.312.mcz ==================== Summary ==================== Name: Cog-eem.312 Author: eem Time: 10 January 2016, 8:35:43.083174 am UUID: a10ff417-a026-4d1c-88be-ae4f006adf5f Ancestors: Cog-eem.311 Set the stack alignment for x64 to 32 since at least Mac OS X expects this. Remember to copy across the screen size when bootstrapping a 64-bit image and nuke the ancient hacked segmented save code. =============== Diff against Cog-eem.311 =============== Item was changed: ----- Method: BochsX64Alien>>initializeStackFor: (in category 'processor setup') ----- initializeStackFor: aCogit "Different cpus need different stack alignment etc, so handle the details here." "From the System V ABI: 3.2.2 The Stack Frame ... The end of the input argument area shall be aligned on a 16 (32, if __m256 is passed on stack) byte boundary. In other words, the value (%rsp + 8) is always a multiple of 16 (32) when control is transferred to the function entry point." | stackAlignment | + stackAlignment := 32. - stackAlignment := 16. aCogit setStackAlignment: stackAlignment expectedSPOffset: 0 expectedFPOffset: 16. PostBuildStackDelta := stackAlignment > 16 ifTrue: [stackAlignment - 16] ifFalse: [0]! Item was changed: ----- Method: SpurBootstrap>>writeSnapshot:ofTransformedImage:headerFlags:screenSize: (in category 'testing') ----- writeSnapshot: imageFileName ofTransformedImage: spurHeap headerFlags: headerFlags screenSize: screenSizeInteger "The bootstrapped image typically contains a few big free chunks and one huge free chunk. Test snapshot writing and loading by turning the largest non-huge chunks into segment bridges and saving." + | penultimate ultimate sim | - | penultimate ultimate sizes counts barriers sim | sim := StackInterpreterSimulator onObjectMemory: spurHeap. sim bootstrapping: true. spurHeap coInterpreter: sim; setEndOfMemory: spurHeap endOfMemory + spurHeap bridgeSize. "hack; initializeInterpreter: cuts it back by bridgeSize" sim initializeInterpreter: 0; setImageHeaderFlagsFrom: headerFlags; + setSavedWindowSize: screenSizeInteger; setDisplayForm: nil. spurHeap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. + "Check that we've left behind the old, pre-pigCompact segmented save" + self assert: (spurHeap isFreeObject: penultimate) not. - (spurHeap isFreeObject: penultimate) ifTrue: "old, pre-pigCompact segmented save" - [self assert: (spurHeap isSegmentBridge: ultimate). - sizes := Bag new. - spurHeap allObjectsInFreeTree: (spurHeap freeLists at: 0) do: - [:f| - sizes add: (spurHeap bytesInObject: f)]. - counts := sizes sortedCounts. - self assert: counts last key = 1. "1 huge chunk" - counts size > 1 - ifTrue: - [self assert: ((counts at: counts size - 1) key > 2 - and: [(counts at: counts size - 1) value > 1024]). - barriers := (1 to: (counts at: counts size - 1) key) collect: - [:ign| spurHeap allocateOldSpaceChunkOfExactlyBytes: (counts at: counts size - 1) value]. - barriers := barriers, {spurHeap allocateOldSpaceChunkOfExactlyBytes: (spurHeap bytesInObject: penultimate)}] - ifFalse: - [barriers := {spurHeap allocateOldSpaceChunkOfExactlyBytes: (spurHeap bytesInObject: penultimate)}]. - barriers last ifNotNil: - [:end| - spurHeap setEndOfMemory: end. - spurHeap allOldSpaceEntitiesDo: [:e| penultimate := ultimate. ultimate := e]. - self assert: (spurHeap addressAfter: ultimate) = end]]. spurHeap checkFreeSpace. spurHeap runLeakCheckerForFullGC. - barriers ifNotNil: "old, pre-pigCompact segmented save" - [spurHeap segmentManager initializeFromFreeChunks: (barriers sort collect: [:b| spurHeap objectStartingAt: b])]. - spurHeap checkFreeSpace. - spurHeap runLeakCheckerForFullGC. sim bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: true. sim imageName: imageFileName. sim writeImageFileIO. Transcript cr; show: 'Done!!'!

1 0

[commit][3549] CogVM source as per VMMaker.oscog-eem.1626
by commits＠squeakvm.org 09 Jan '16

09 Jan '16

Revision: 3549 Author: eliot Date: 2016-01-09 12:37:15 -0800 (Sat, 09 Jan 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1626 x64 Cogit: ceCaptureCStackPointers cannot assume VarBaseReg is caller-saved and should save and restore it if used. Add support for dumping the register state on x86_64 Mac OS Cocoa. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-01-09 18:55:57 UTC (rev 3548) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-01-09 20:37:15 UTC (rev 3549) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + CCodeGenerator VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-01-09 18:55:57 UTC (rev 3548) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-01-09 20:37:15 UTC (rev 3549) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + CCodeGenerator VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + StackToRegisterMappingCogit VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -501,7 +501,6 @@ static sqInt NoDbgRegParms loadPICLiteralByteSize(AbstractInstruction * self_in_loadPICLiteralByteSize); static sqInt NoDbgRegParms machineCodeBytes(AbstractInstruction * self_in_machineCodeBytes); static sqInt NoDbgRegParms machineCodeWords(AbstractInstruction * self_in_machineCodeWords); -static AbstractInstruction * NoDbgRegParms maybeEstablishVarBase(AbstractInstruction * self_in_maybeEstablishVarBase); static sqInt NoDbgRegParms memM16xrregbasepuwloffset(AbstractInstruction * self_in_memM16xrregbasepuwloffset, sqInt cond, sqInt destReg, sqInt baseReg, sqInt postpreoffset, sqInt updown, sqInt weirdstuff, sqInt loadstore, sqInt offset8); static sqInt NoDbgRegParms memM16xrregbasepuwlrm(AbstractInstruction * self_in_memM16xrregbasepuwlrm, sqInt cond, sqInt destReg, sqInt baseReg, sqInt postpreoffset, sqInt updown, sqInt weirdstuff, sqInt loadstore, sqInt offsetReg); static sqInt NoDbgRegParms memMxrregbasepubwlimm(AbstractInstruction * self_in_memMxrregbasepubwlimm, sqInt cond, sqInt destReg, sqInt baseReg, sqInt postpreoffset, sqInt updown, sqInt byteword, sqInt weirdstuff, sqInt loadstore, sqInt offset); @@ -905,7 +904,7 @@ static sqInt NoDbgRegParms genGetClassIndexOfNonImminto(sqInt sourceReg, sqInt destReg); static sqInt NoDbgRegParms genGetClassObjectOfClassIndexintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver); -static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); +static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg); static sqInt NoDbgRegParms genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg); static sqInt NoDbgRegParms genGetFormatOfinto(sqInt srcReg, sqInt destReg); @@ -1021,8 +1020,8 @@ static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); -static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg); -static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); +static sqInt NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling); static sqInt genPushClosureTempsBytecode(void); @@ -6641,26 +6640,6 @@ } -/* The receiver has a VarBaseReg; generate the code to set it to its value. */ - - /* CogARMCompiler>>#maybeEstablishVarBase */ -static AbstractInstruction * NoDbgRegParms -maybeEstablishVarBase(AbstractInstruction * self_in_maybeEstablishVarBase) -{ - AbstractInstruction *anInstruction; - sqInt quickConstant; - - /* begin MoveCq:R: */ - quickConstant = varBaseAddress(); - /* begin gen:quickConstant:operand: */ - anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg); - if (usesOutOfLineLiteral(anInstruction)) { - (anInstruction->dependent = locateLiteral(quickConstant)); - } - return self_in_maybeEstablishVarBase; -} - - /* build an ARM [base +/- offset8] half-word memory instruction p -> pre-index (1) or post-index (0) the offset. Combines with W to do some odd things. @@ -10227,12 +10206,21 @@ static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) { + AbstractInstruction *anInstruction; sqInt endAddress; sqInt enilopmart; + sqInt quickConstant; sqInt size; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + quickConstant = varBaseAddress(); + /* begin gen:quickConstant:operand: */ + anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg); + if (usesOutOfLineLiteral(anInstruction)) { + (anInstruction->dependent = locateLiteral(quickConstant)); + } + ((AbstractInstruction *) backEnd); genLoadStackPointers(backEnd); if (regArg3OrNone != NoReg) { /* begin PopR: */ @@ -10317,9 +10305,11 @@ sqInt address1; sqInt address2; AbstractInstruction *anInstruction; + AbstractInstruction *anInstruction1; sqInt fixupSize; sqInt opcodeSize; sqInt quickConstant; + sqInt quickConstant1; sqInt startAddress; /* begin allocateOpcodes:bytecodes: */ @@ -10332,7 +10322,17 @@ zeroOpcodeIndex(); labelCounter = 0; startAddress = methodZoneBase; - maybeEstablishVarBase(backEnd); + /* begin maybeSaveVarBase */ + genoperand(PushR, VarBaseReg); + ((AbstractInstruction *) backEnd); + /* begin maybeEstablishVarBase */ + quickConstant1 = varBaseAddress(); + /* begin gen:quickConstant:operand: */ + anInstruction1 = genoperandoperand(MoveCqR, quickConstant1, VarBaseReg); + if (usesOutOfLineLiteral(anInstruction1)) { + (anInstruction1->dependent = locateLiteral(quickConstant1)); + } + ((AbstractInstruction *) backEnd); if (captureFramePointer) { /* begin MoveR:Aw: */ address = cFramePointerAddress(); @@ -10344,6 +10344,9 @@ /* begin gen:operand:literal: */ checkLiteralforInstruction(address1, genoperandoperand(MoveRAw, SPReg, address1)); + /* begin maybeRestoreVarBase */ + genoperand(PopR, VarBaseReg); + ((AbstractInstruction *) backEnd); /* begin RetN: */ genoperand(RetN, 0); outputInstructionsForGeneratedRuntimeAt(startAddress); @@ -15623,7 +15626,7 @@ /* FP jumps are a little weird */ jumpCond = jumpOpcodeGenerator(0); - /* begin genMoveFalseR: */ + /* begin genMoveConstant:R: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -15639,7 +15642,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); + jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -16302,7 +16305,6 @@ jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); genRemoveSmallIntegerTagsInScratchReg(Arg1Reg); - /* begin MulR:R: */ genMulRR(backEnd, Arg1Reg, ClassReg); /* begin JumpOverflow: */ jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0)); @@ -16449,7 +16451,7 @@ /* begin CmpR:R: */ genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg); jumpTrue = genConditionalBranchoperand(jumpOpcode, 0); - /* begin genMoveFalseR: */ + /* begin genMoveConstant:R: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -16465,7 +16467,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpTrue, genMoveTrueR(ReceiverResultReg)); + jmpTarget(jumpTrue, genMoveConstantR(trueObject(), ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -16520,7 +16522,7 @@ /* FP jumps are a little weird */ jumpCond = jumpFPOpcodeGenerator(0); - /* begin genMoveFalseR: */ + /* begin genMoveConstant:R: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -16536,7 +16538,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); + jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -19911,7 +19913,7 @@ } /* CogObjectRepresentationForSpur>>#genGetClassTagOf:into:scratchReg: */ -static sqInt NoDbgRegParms +static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg) { return genGetInlineCacheClassTagFromintoforEntry(instReg, destReg, 1); @@ -20408,7 +20410,7 @@ /* begin JumpNonZero: */ jumpCmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); } - /* begin genMoveTrueR: */ + /* begin genMoveConstant:R: */ constant = trueObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -20424,7 +20426,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCmp, genMoveFalseR(ReceiverResultReg)); + jmpTarget(jumpCmp, genMoveConstantR(falseObject(), ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -23541,15 +23543,12 @@ return 0; } - /* SimpleStackBasedCogit>>#genMoveFalseR: */ + /* SimpleStackBasedCogit>>#genMoveConstant:R: */ static AbstractInstruction * NoDbgRegParms -genMoveFalseR(sqInt reg) +genMoveConstantR(sqInt constant, sqInt reg) { AbstractInstruction *anInstruction; - sqInt constant; - /* begin genMoveConstant:R: */ - constant = falseObject(); return (shouldAnnotateObjectReference(constant) ? annotateobjRef(gMoveCwR(constant, reg), constant) : (/* begin MoveCq:R: */ @@ -23561,7 +23560,7 @@ } /* SimpleStackBasedCogit>>#genMoveTrueR: */ -static AbstractInstruction * NoDbgRegParms +static sqInt NoDbgRegParms genMoveTrueR(sqInt reg) { AbstractInstruction *anInstruction; @@ -23621,15 +23620,24 @@ AbstractInstruction *anInstruction4; AbstractInstruction *anInstruction5; AbstractInstruction *anInstruction6; + AbstractInstruction *anInstruction7; sqInt callTarget; AbstractInstruction *continuePostSample; AbstractInstruction * inst; AbstractInstruction *jmpFail; AbstractInstruction *jmpSample; + sqInt quickConstant; sqInt reg; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + quickConstant = varBaseAddress(); + /* begin gen:quickConstant:operand: */ + anInstruction7 = genoperandoperand(MoveCqR, quickConstant, VarBaseReg); + if (usesOutOfLineLiteral(anInstruction7)) { + (anInstruction7->dependent = locateLiteral(quickConstant)); + } + ((AbstractInstruction *) backEnd); if (profiling) { /* Test nextProfileTick for being non-zero and call checkProfileTick: if so. @@ -25608,13 +25616,22 @@ static void (*genCallPICEnilopmartNumArgs(sqInt numArgs))(void) { + AbstractInstruction *anInstruction; sqInt endAddress; sqInt enilopmart; + sqInt quickConstant; sqInt reg; sqInt size; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + quickConstant = varBaseAddress(); + /* begin gen:quickConstant:operand: */ + anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg); + if (usesOutOfLineLiteral(anInstruction)) { + (anInstruction->dependent = locateLiteral(quickConstant)); + } + ((AbstractInstruction *) backEnd); genLoadStackPointers(backEnd); /* begin PopR: */ genoperand(PopR, ClassReg); Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-01-09 18:55:57 UTC (rev 3548) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-01-09 20:37:15 UTC (rev 3549) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + CCodeGenerator VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + StackToRegisterMappingCogit VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -463,7 +463,6 @@ static sqInt NoDbgRegParms loadLiteralByteSize(AbstractInstruction * self_in_loadLiteralByteSize); static sqInt NoDbgRegParms loadPICLiteralByteSize(AbstractInstruction * self_in_loadPICLiteralByteSize); static sqInt NoDbgRegParms machineCodeBytes(AbstractInstruction * self_in_machineCodeBytes); -static AbstractInstruction * NoDbgRegParms maybeEstablishVarBase(AbstractInstruction * self_in_maybeEstablishVarBase); static sqInt NoDbgRegParms modRMRO(AbstractInstruction * self_in_modRMRO, sqInt mod, sqInt regMode, sqInt regOpcode); static sqInt NoDbgRegParms nsSendCacheAt(AbstractInstruction * self_in_nsSendCacheAt, char *callSiteReturnAddress); static sqInt NoDbgRegParms numCheckFeaturesOpcodes(AbstractInstruction * self_in_numCheckFeaturesOpcodes); @@ -852,7 +851,7 @@ static sqInt NoDbgRegParms genGetClassIndexOfNonImminto(sqInt sourceReg, sqInt destReg); static sqInt NoDbgRegParms genGetClassObjectOfClassIndexintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver); -static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); +static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg); static sqInt NoDbgRegParms genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg); static sqInt NoDbgRegParms genGetFormatOfinto(sqInt srcReg, sqInt destReg); @@ -3197,7 +3196,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset15) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset15) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset15) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpLongNonZero: @@ -3237,7 +3236,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case Jump: @@ -3302,7 +3301,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpNonNegative: @@ -3340,7 +3339,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset110) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset110) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset110) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpOverflow: @@ -3378,7 +3377,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset111) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset111) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset111) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpNoOverflow: @@ -3416,7 +3415,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset112) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset112) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset112) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpCarry: @@ -3456,7 +3455,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset113) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset113) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset113) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpNoCarry: @@ -3496,7 +3495,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset114) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset114) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset114) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpLess: @@ -3534,7 +3533,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset115) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset115) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset115) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpGreaterOrEqual: @@ -3572,7 +3571,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset116) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset116) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset116) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpGreater: @@ -3610,7 +3609,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset117) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset117) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset117) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpLessOrEqual: @@ -3648,7 +3647,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset118) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset118) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset118) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpAbove: @@ -3687,7 +3686,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset119) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset119) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset119) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpBelowOrEqual: @@ -3726,7 +3725,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset120) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset120) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset120) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpFPOrdered: @@ -3764,7 +3763,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset121) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset121) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset121) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case JumpFPUnordered: @@ -3802,7 +3801,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset122) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset122) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset122) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 6); + ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); return; case RetN: @@ -5865,16 +5864,6 @@ } -/* The receiver does not have a VarBaseReg; do nothing. */ - - /* CogIA32Compiler>>#maybeEstablishVarBase */ -static AbstractInstruction * NoDbgRegParms -maybeEstablishVarBase(AbstractInstruction * self_in_maybeEstablishVarBase) -{ - return self_in_maybeEstablishVarBase; -} - - /* See ModR/M byte & opcode syntax In addition to the notation shown above in 'Mnemonic Syntax' on page 43, the following notation indicates the size and type of operands in the @@ -9293,7 +9282,8 @@ sqInt size; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + ((AbstractInstruction *) backEnd); genLoadStackPointers(backEnd); if (regArg3OrNone != NoReg) { /* begin PopR: */ @@ -9385,7 +9375,10 @@ zeroOpcodeIndex(); labelCounter = 0; startAddress = methodZoneBase; - maybeEstablishVarBase(backEnd); + /* begin maybeSaveVarBase */ + ((AbstractInstruction *) backEnd); + /* begin maybeEstablishVarBase */ + ((AbstractInstruction *) backEnd); if (captureFramePointer) { /* begin MoveR:Aw: */ address = cFramePointerAddress(); @@ -9403,6 +9396,8 @@ /* begin gen:operand:literal: */ anInstruction3 = genoperandoperand(MoveRAw, TempReg, address2); + /* begin maybeRestoreVarBase */ + ((AbstractInstruction *) backEnd); /* begin RetN: */ genoperand(RetN, 0); outputInstructionsForGeneratedRuntimeAt(startAddress); @@ -9625,12 +9620,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -15292,6 +15287,7 @@ jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); genRemoveSmallIntegerTagsInScratchReg(Arg1Reg); + /* begin MulR:R: */ genMulRR(backEnd, Arg1Reg, ClassReg); /* begin JumpOverflow: */ jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0)); @@ -18210,7 +18206,7 @@ } /* CogObjectRepresentationForSpur>>#genGetClassTagOf:into:scratchReg: */ -static AbstractInstruction * NoDbgRegParms +static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg) { return genGetInlineCacheClassTagFromintoforEntry(instReg, destReg, 1); @@ -20924,7 +20920,8 @@ sqInt reg; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + ((AbstractInstruction *) backEnd); if (profiling) { /* Test nextProfileTick for being non-zero and call checkProfileTick: if so. @@ -22873,7 +22870,8 @@ sqInt size; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + ((AbstractInstruction *) backEnd); genLoadStackPointers(backEnd); /* begin PopR: */ genoperand(PopR, ClassReg); Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-01-09 18:55:57 UTC (rev 3548) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-01-09 20:37:15 UTC (rev 3549) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + CCodeGenerator VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + StackToRegisterMappingCogit VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -782,7 +782,7 @@ static usqInt NoDbgRegParms concretizeBrUnsignedGreaterRR(AbstractInstruction * self_in_concretizeBrUnsignedGreaterRR); static usqInt NoDbgRegParms concretizeBrUnsignedLessEqualRR(AbstractInstruction * self_in_concretizeBrUnsignedLessEqualRR); static usqInt NoDbgRegParms concretizeBrUnsignedLessRR(AbstractInstruction * self_in_concretizeBrUnsignedLessRR); -static sqInt NoDbgRegParms concretizeCall(AbstractInstruction * self_in_concretizeCall); +static usqInt NoDbgRegParms concretizeCall(AbstractInstruction * self_in_concretizeCall); static usqInt NoDbgRegParms concretizeCallFull(AbstractInstruction * self_in_concretizeCallFull); static sqInt NoDbgRegParms concretizeCmpCqR(AbstractInstruction * self_in_concretizeCmpCqR); static sqInt NoDbgRegParms concretizeCmpCwR(AbstractInstruction * self_in_concretizeCmpCwR); @@ -791,7 +791,7 @@ static usqInt NoDbgRegParms concretizeFill32(AbstractInstruction * self_in_concretizeFill32); static usqInt NoDbgRegParms concretizeJump(AbstractInstruction * self_in_concretizeJump); static usqInt NoDbgRegParms concretizeJumpFull(AbstractInstruction * self_in_concretizeJumpFull); -static sqInt NoDbgRegParms concretizeJumpLong(AbstractInstruction * self_in_concretizeJumpLong); +static usqInt NoDbgRegParms concretizeJumpLong(AbstractInstruction * self_in_concretizeJumpLong); static sqInt NoDbgRegParms concretizeJumpLongNonZero(AbstractInstruction * self_in_concretizeJumpLongNonZero); static sqInt NoDbgRegParms concretizeJumpLongZero(AbstractInstruction * self_in_concretizeJumpLongZero); static sqInt NoDbgRegParms concretizeJumpNonZero(AbstractInstruction * self_in_concretizeJumpNonZero); @@ -832,22 +832,22 @@ static usqInt NoDbgRegParms concretizeMulCheckOverflowRR(AbstractInstruction * self_in_concretizeMulCheckOverflowRR); static usqInt NoDbgRegParms concretizeNegateR(AbstractInstruction * self_in_concretizeNegateR); static usqInt NoDbgRegParms concretizeNop(AbstractInstruction * self_in_concretizeNop); -static sqInt NoDbgRegParms concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR); +static usqInt NoDbgRegParms concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR); static usqInt NoDbgRegParms concretizeOrCwR(AbstractInstruction * self_in_concretizeOrCwR); static usqInt NoDbgRegParms concretizeOrRR(AbstractInstruction * self_in_concretizeOrRR); static usqInt NoDbgRegParms concretizePopR(AbstractInstruction * self_in_concretizePopR); static usqInt NoDbgRegParms concretizePrefetchAw(AbstractInstruction * self_in_concretizePrefetchAw); -static usqInt NoDbgRegParms concretizePushCq(AbstractInstruction * self_in_concretizePushCq); +static sqInt NoDbgRegParms concretizePushCq(AbstractInstruction * self_in_concretizePushCq); static usqInt NoDbgRegParms concretizePushCw(AbstractInstruction * self_in_concretizePushCw); static usqInt NoDbgRegParms concretizePushR(AbstractInstruction * self_in_concretizePushR); static usqInt NoDbgRegParms concretizeRetN(AbstractInstruction * self_in_concretizeRetN); static usqInt NoDbgRegParms concretizeStop(AbstractInstruction * self_in_concretizeStop); static usqInt NoDbgRegParms concretizeSubCheckOverflowCqR(AbstractInstruction * self_in_concretizeSubCheckOverflowCqR); static usqInt NoDbgRegParms concretizeSubCheckOverflowRR(AbstractInstruction * self_in_concretizeSubCheckOverflowRR); -static usqInt NoDbgRegParms concretizeSubCqR(AbstractInstruction * self_in_concretizeSubCqR); +static sqInt NoDbgRegParms concretizeSubCqR(AbstractInstruction * self_in_concretizeSubCqR); static usqInt NoDbgRegParms concretizeSubCwR(AbstractInstruction * self_in_concretizeSubCwR); static usqInt NoDbgRegParms concretizeSubRR(AbstractInstruction * self_in_concretizeSubRR); -static sqInt NoDbgRegParms concretizeTstCqR(AbstractInstruction * self_in_concretizeTstCqR); +static usqInt NoDbgRegParms concretizeTstCqR(AbstractInstruction * self_in_concretizeTstCqR); static usqInt NoDbgRegParms concretizeTstCwR(AbstractInstruction * self_in_concretizeTstCwR); static sqInt NoDbgRegParms concretizeUnimplemented(AbstractInstruction * self_in_concretizeUnimplemented); static usqInt NoDbgRegParms concretizeXorCwR(AbstractInstruction * self_in_concretizeXorCwR); @@ -909,7 +909,6 @@ static sqInt NoDbgRegParms lwRbaseoffset(AbstractInstruction * self_in_lwRbaseoffset, sqInt destReg, sqInt baseReg, sqInt offset); static sqInt NoDbgRegParms machineCodeBytes(AbstractInstruction * self_in_machineCodeBytes); static sqInt NoDbgRegParms machineCodeWords(AbstractInstruction * self_in_machineCodeWords); -static AbstractInstruction * NoDbgRegParms maybeEstablishVarBase(AbstractInstruction * self_in_maybeEstablishVarBase); static sqInt NoDbgRegParms mfhiR(AbstractInstruction * self_in_mfhiR, sqInt destReg); static sqInt NoDbgRegParms mfloR(AbstractInstruction * self_in_mfloR, sqInt destReg); static sqInt NoDbgRegParms mipsbreak(AbstractInstruction * self_in_mipsbreak, sqInt code); @@ -1048,7 +1047,7 @@ static sqInt NoDbgRegParms genGetClassIndexOfNonImminto(sqInt sourceReg, sqInt destReg); static sqInt NoDbgRegParms genGetClassObjectOfClassIndexintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver); -static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); +static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg); static sqInt NoDbgRegParms genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg); static sqInt NoDbgRegParms genGetFormatOfinto(sqInt srcReg, sqInt destReg); @@ -1136,8 +1135,8 @@ static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); -static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); -static sqInt NoDbgRegParms genMoveTrueR(sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling); static sqInt genPushClosureTempsBytecode(void); @@ -5403,7 +5402,8 @@ sqInt size; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + ((AbstractInstruction *) backEnd); genLoadStackPointers(backEnd); if (regArg3OrNone != NoReg) { /* begin PopR: */ @@ -5508,7 +5508,10 @@ zeroOpcodeIndex(); labelCounter = 0; startAddress = methodZoneBase; - maybeEstablishVarBase(backEnd); + /* begin maybeSaveVarBase */ + ((AbstractInstruction *) backEnd); + /* begin maybeEstablishVarBase */ + ((AbstractInstruction *) backEnd); if (captureFramePointer) { /* begin MoveR:Aw: */ address = cFramePointerAddress(); @@ -5520,6 +5523,8 @@ /* begin gen:operand:literal: */ anInstruction2 = genoperandoperand(MoveRAw, SPReg, address1); + /* begin maybeRestoreVarBase */ + ((AbstractInstruction *) backEnd); /* begin RetN: */ genoperand(RetN, 0); outputInstructionsForGeneratedRuntimeAt(startAddress); @@ -5742,12 +5747,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -8588,7 +8593,7 @@ relocateCallsInClosedPIC(CogMethod *cPIC) { sqLong callDelta; - usqInt entryPoint; + sqInt entryPoint; sqInt i; sqInt pc; sqLong refDelta; @@ -11671,7 +11676,7 @@ the method zone. */ /* CogMIPSELCompiler>>#concretizeCall */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms concretizeCall(AbstractInstruction * self_in_concretizeCall) { return concretizeCallFull(self_in_concretizeCall); @@ -11841,7 +11846,7 @@ } /* CogMIPSELCompiler>>#concretizeJumpLong */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms concretizeJumpLong(AbstractInstruction * self_in_concretizeJumpLong) { return concretizeJumpFull(self_in_concretizeJumpLong); @@ -12551,7 +12556,7 @@ } /* CogMIPSELCompiler>>#concretizeOrCqR */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR) { sqInt aWord; @@ -12653,7 +12658,7 @@ } /* CogMIPSELCompiler>>#concretizePushCq */ -static usqInt NoDbgRegParms +static sqInt NoDbgRegParms concretizePushCq(AbstractInstruction * self_in_concretizePushCq) { return concretizePushCw(self_in_concretizePushCq); @@ -12818,7 +12823,7 @@ } /* CogMIPSELCompiler>>#concretizeSubCqR */ -static usqInt NoDbgRegParms +static sqInt NoDbgRegParms concretizeSubCqR(AbstractInstruction * self_in_concretizeSubCqR) { sqInt aWord; @@ -12880,7 +12885,7 @@ } /* CogMIPSELCompiler>>#concretizeTstCqR */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms concretizeTstCqR(AbstractInstruction * self_in_concretizeTstCqR) { sqInt aWord; @@ -14165,23 +14170,6 @@ return 7; } - -/* The receiver has a VarBaseReg; generate the code to set it to its value. */ - - /* CogMIPSELCompiler>>#maybeEstablishVarBase */ -static AbstractInstruction * NoDbgRegParms -maybeEstablishVarBase(AbstractInstruction * self_in_maybeEstablishVarBase) -{ - AbstractInstruction *anInstruction; - sqInt quickConstant; - - /* begin MoveCq:R: */ - quickConstant = varBaseAddress(); - /* begin gen:quickConstant:operand: */ - anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg); - return self_in_maybeEstablishVarBase; -} - /* CogMIPSELCompiler>>#mfhiR: */ static sqInt NoDbgRegParms mfhiR(AbstractInstruction * self_in_mfhiR, sqInt destReg) @@ -15638,7 +15626,6 @@ jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); genRemoveSmallIntegerTagsInScratchReg(Arg1Reg); - /* begin MulR:R: */ genMulRR(backEnd, Arg1Reg, ClassReg); /* begin JumpOverflow: */ jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0)); @@ -15779,7 +15766,7 @@ /* begin CmpR:R: */ genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg); jumpTrue = genConditionalBranchoperand(jumpOpcode, 0); - /* begin genMoveConstant:R: */ + /* begin genMoveFalseR: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -15792,7 +15779,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpTrue, genMoveConstantR(trueObject(), ReceiverResultReg)); + jmpTarget(jumpTrue, genMoveTrueR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -15847,7 +15834,7 @@ /* FP jumps are a little weird */ jumpCond = jumpFPOpcodeGenerator(0); - /* begin genMoveConstant:R: */ + /* begin genMoveFalseR: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -15860,7 +15847,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); + jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -18500,7 +18487,7 @@ } /* CogObjectRepresentationForSpur>>#genGetClassTagOf:into:scratchReg: */ -static sqInt NoDbgRegParms +static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg) { return genGetInlineCacheClassTagFromintoforEntry(instReg, destReg, 1); @@ -18908,7 +18895,7 @@ /* begin JumpNonZero: */ jumpCmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); } - /* begin genMoveConstant:R: */ + /* begin genMoveTrueR: */ constant = trueObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -18921,7 +18908,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCmp, genMoveConstantR(falseObject(), ReceiverResultReg)); + jmpTarget(jumpCmp, genMoveFalseR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -21114,12 +21101,15 @@ return 0; } - /* SimpleStackBasedCogit>>#genMoveConstant:R: */ + /* SimpleStackBasedCogit>>#genMoveFalseR: */ static AbstractInstruction * NoDbgRegParms -genMoveConstantR(sqInt constant, sqInt reg) +genMoveFalseR(sqInt reg) { AbstractInstruction *anInstruction; + sqInt constant; + /* begin genMoveConstant:R: */ + constant = falseObject(); return (shouldAnnotateObjectReference(constant) ? annotateobjRef(gMoveCwR(constant, reg), constant) : (/* begin MoveCq:R: */ @@ -21128,7 +21118,7 @@ } /* SimpleStackBasedCogit>>#genMoveTrueR: */ -static sqInt NoDbgRegParms +static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg) { AbstractInstruction *anInstruction; @@ -21201,7 +21191,8 @@ sqInt reg; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + ((AbstractInstruction *) backEnd); if (profiling) { /* Test nextProfileTick for being non-zero and call checkProfileTick: if so. @@ -23151,7 +23142,8 @@ sqInt size; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + ((AbstractInstruction *) backEnd); genLoadStackPointers(backEnd); /* begin PopR: */ genoperand(PopR, ClassReg); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Sat Jan 9 10:53:52 PST 2016 + Sat Jan 9 12:36:11 PST 2016 Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m =================================================================== --- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m 2016-01-09 18:55:57 UTC (rev 3548) +++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakMainApp.m 2016-01-09 20:37:15 UTC (rev 3549) @@ -162,7 +162,6 @@ * set to the native stack & frame pointers. */ extern void ifValidWriteBackStackPointersSaveTo(void*,void*,char**,char**); -# if __APPLE__ && __MACH__ # if __i386__ /* see sys/ucontext.h; two different namings */ # if __GNUC__ && !__INTEL_COMPILER /* icc pretends to be gcc */ @@ -185,7 +184,6 @@ char *savedSP, *savedFP; ifValidWriteBackStackPointersSaveTo(fp,sp,&savedFP,&savedSP); -# endif printingStack = true; if (printAll) { @@ -221,7 +219,7 @@ static void * printRegisterState(ucontext_t *uap) { -#if __DARWIN_UNIX03 && __APPLE__ && __MACH__ && __i386__ +#if __DARWIN_UNIX03 && __i386__ _STRUCT_X86_THREAD_STATE32 *regs = &uap->uc_mcontext->__ss; printf( "\teax 0x%08x ebx 0x%08x ecx 0x%08x edx 0x%08x\n" "\tedi 0x%08x esi 0x%08x ebp 0x%08x esp 0x%08x\n" @@ -230,7 +228,7 @@ regs->__edi, regs->__edi, regs->__ebp, regs->__esp, regs->__eip); return (void *)(regs->__eip); -#elif __APPLE__ && __MACH__ && __i386__ +#elif __i386__ _STRUCT_X86_THREAD_STATE32 *regs = &uap->uc_mcontext->ss; printf( "\teax 0x%08x ebx 0x%08x ecx 0x%08x edx 0x%08x\n" "\tedi 0x%08x esi 0x%08x ebp 0x%08x esp 0x%08x\n" @@ -239,6 +237,31 @@ regs->edi, regs->edi, regs->ebp, regs->esp, regs->eip); return (void *)(regs->eip); +#elif __x86_64__ + _STRUCT_X86_THREAD_STATE64 *regs = &uap->uc_mcontext->__ss; + printf( "\trax 0x%016lx rbx 0x%016lx rcx 0x%016lx rdx 0x%016lx\n" + "\trdi 0x%016lx rsi 0x%016lx rbp 0x%016lx rsp 0x%016lx\n" + "\tr8 0x%016lx r9 0x%016lx r10 0x%016lx r11 0x%016lx\n" + "\tr12 0x%016lx r13 0x%016lx r14 0x%016lx r15 0x%016lx\n" + "\trip 0x%016lx\n", + regs->__rax, regs->__rbx, regs->__rcx, regs->__rdx, + regs->__rdi, regs->__rdi, regs->__rbp, regs->__rsp, + regs->__r8 , regs->__r9 , regs->__r10, regs->__r11, + regs->__r12, regs->__r13, regs->__r14, regs->__r15, + regs->__rip); + return (void *)(regs->__rip); +# elif defined(__arm__) || defined(__arm32__) + _STRUCT_ARM_THREAD_STATE *regs = &uap->uc_mcontext->ss; + printf( "\t r0 0x%08x r1 0x%08x r2 0x%08x r3 0x%08x\n" + "\t r4 0x%08x r5 0x%08x r6 0x%08x r7 0x%08x\n" + "\t r8 0x%08x r9 0x%08x r10 0x%08x fp 0x%08x\n" + "\t ip 0x%08x sp 0x%08x lr 0x%08x pc 0x%08x\n" + "\tcpsr 0x%08x\n", + regs->r[0],regs->r[1],regs->r[2],regs->r[3], + regs->r[4],regs->r[5],regs->r[6],regs->r[7], + regs->r[8],regs->r[9],regs->r[10],regs->r[11], + regs->r[12], regs->sp, regs->lr, regs->pc, regs->cpsr); + return (void *)(regs->pc); #else printf("don't know how to derive register state from a ucontext_t on this platform\n"); return 0; @@ -367,11 +390,12 @@ */ /* - * Cog has already captured CStackPointer before calling this routine. Record - * the original value, capture the pointers again and determine if CFramePointer + * Cog has already captured CStackPointer before calling this routine. Record + * the original value, capture the pointers again and see if CFramePointer * lies between the two stack pointers and hence is likely in use. This is - * necessary since optimizing C compilers for x86 may use %ebp as a general- - * purpose register, in which case it must not be captured. + * necessary since optimizing C compilers for x86, x64 et al may use the frame + * pointer register (%ebp, %rbp et al) as a general-purpose register, in which + * case it must not be captured. Assumes stacks descend. */ int isCFramePointerInUse() @@ -380,7 +404,6 @@ extern void (*ceCaptureCStackPointers)(void); unsigned long currentCSP = CStackPointer; - currentCSP = CStackPointer; ceCaptureCStackPointers(); assert(CStackPointer < currentCSP); return CFramePointer >= CStackPointer && CFramePointer <= currentCSP; Modified: branches/Cog/spur64src/vm/cogit.h =================================================================== --- branches/Cog/spur64src/vm/cogit.h 2016-01-09 18:55:57 UTC (rev 3548) +++ branches/Cog/spur64src/vm/cogit.h 2016-01-09 20:37:15 UTC (rev 3549) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + CCodeGenerator VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 */ Modified: branches/Cog/spur64src/vm/cogitX64.c =================================================================== --- branches/Cog/spur64src/vm/cogitX64.c 2016-01-09 18:55:57 UTC (rev 3548) +++ branches/Cog/spur64src/vm/cogitX64.c 2016-01-09 20:37:15 UTC (rev 3549) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + CCodeGenerator VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 + StackToRegisterMappingCogit VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1626 uuid: 5153564f-5657-42ca-a4c9-84b55b308375 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -789,7 +789,7 @@ static sqInt NoDbgRegParms genGetClassIndexOfNonImminto(sqInt sourceReg, sqInt destReg); static sqInt NoDbgRegParms genGetClassObjectOfClassIndexintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver); -static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); +static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg); static sqInt NoDbgRegParms genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg); static sqInt NoDbgRegParms genGetFormatOfinto(sqInt srcReg, sqInt destReg); @@ -838,7 +838,7 @@ static sqInt NoDbgRegParms codeGranularity(AbstractInstruction * self_in_codeGranularity); static sqInt NoDbgRegParms computeMaximumSize(AbstractInstruction * self_in_computeMaximumSize); static sqInt NoDbgRegParms computeShiftRRSize(AbstractInstruction * self_in_computeShiftRRSize); -static usqInt NoDbgRegParms concretizeArithCqRWithROraxOpcode(AbstractInstruction * self_in_concretizeArithCqRWithROraxOpcode, sqInt regOpcode, sqInt raxOpcode); +static sqInt NoDbgRegParms concretizeArithCqRWithROraxOpcode(AbstractInstruction * self_in_concretizeArithCqRWithROraxOpcode, sqInt regOpcode, sqInt raxOpcode); static usqInt NoDbgRegParms concretizeFill32(AbstractInstruction * self_in_concretizeFill32); static usqInt NoDbgRegParms concretizeMoveX32rRR(AbstractInstruction * self_in_concretizeMoveX32rRR); static usqInt NoDbgRegParms concretizeOpRR(AbstractInstruction * self_in_concretizeOpRR, sqInt x64opcode); @@ -879,7 +879,6 @@ static sqInt NoDbgRegParms loadPICLiteralByteSize(AbstractInstruction * self_in_loadPICLiteralByteSize); static usqInt NoDbgRegParms machineCodeAt(AbstractInstruction * self_in_machineCodeAt, sqInt anOffset); static sqInt NoDbgRegParms machineCodeBytes(AbstractInstruction * self_in_machineCodeBytes); -static AbstractInstruction * NoDbgRegParms maybeEstablishVarBase(AbstractInstruction * self_in_maybeEstablishVarBase); static sqInt NoDbgRegParms modRMRO(AbstractInstruction * self_in_modRMRO, sqInt mod, sqInt regMode, sqInt regOpcode); static sqInt NoDbgRegParms numIntRegArgs(AbstractInstruction * self_in_numIntRegArgs); static AbstractInstruction * NoDbgRegParms padIfPossibleWithStopsFromto(AbstractInstruction * self_in_padIfPossibleWithStopsFromto, sqInt startAddr, sqInt endAddr); @@ -926,7 +925,7 @@ static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); -static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); +static sqInt NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling); static sqInt genPushClosureTempsBytecode(void); @@ -5070,12 +5069,18 @@ static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void) { + AbstractInstruction *anInstruction; sqInt endAddress; sqInt enilopmart; + sqInt quickConstant; sqInt size; zeroOpcodeIndex(); - maybeEstablishVarBase(backEnd); + /* begin maybeEstablishVarBase */ + quickConstant = varBaseAddress(); + /* begin gen:quickConstant:operand: */ + anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg); + ((AbstractInstruction *) backEnd); genLoadStackPointers(backEnd); if (regArg3OrNone != NoReg) { /* begin PopR: */ @@ -5152,9 +5157,11 @@ AbstractInstruction *anInstruction1; AbstractInstruction *anInstruction2; AbstractInstruction *anInstruction3; + AbstractInstruction *anInstruction4; sqInt fixupSize; sqInt opcodeSize; sqInt quickConstant; + sqInt quickConstant1; sqInt startAddress; /* begin allocateOpcodes:bytecodes: */ @@ -5167,7 +5174,14 @@ zeroOpcodeIndex(); labelCounter = 0; startAddress = methodZoneBase; - maybeEstablishVarBase(backEnd); + /* begin maybeSaveVarBase */ + genoperand(PushR, VarBaseReg); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1626.mcz
by commits＠source.squeak.org 09 Jan '16

09 Jan '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1626.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1626 Author: eem Time: 9 January 2016, 12:30:43.60787 pm UUID: 5153564f-5657-42ca-a4c9-84b55b308375 Ancestors: VMMaker.oscog-eem.1625 x64 Cogit: cecaptureCStackPointers cannot assume VarBaseReg is caller-saved and should save and restore it if used. =============== Diff against VMMaker.oscog-eem.1625 =============== Item was changed: ----- Method: CogARMCompiler>>maybeEstablishVarBase (in category 'abstract instructions') ----- maybeEstablishVarBase "The receiver has a VarBaseReg; generate the code to set it to its value." + <inline: true> cogit MoveCq: cogit varBaseAddress R: VarBaseReg! Item was added: + ----- Method: CogARMCompiler>>maybeRestoreVarBase (in category 'abstract instructions') ----- + maybeRestoreVarBase + "The receiver has a VarBaseReg; generate the code to pop its value." + <inline: true> + cogit PopR: VarBaseReg! Item was added: + ----- Method: CogARMCompiler>>maybeSaveVarBase (in category 'abstract instructions') ----- + maybeSaveVarBase + "The receiver has a VarBaseReg; generate the code to push its value." + <inline: true> + cogit PushR: VarBaseReg! Item was changed: ----- Method: CogAbstractInstruction>>maybeEstablishVarBase (in category 'abstract instructions') ----- maybeEstablishVarBase + "If the receiver has a VarBaseReg, generate the code to set it to its value. + By default do nothing." + <inline: true>! - "If the receiver has a VarBaseReg, generate the code to set it to its value." - self subclassResponsibility! Item was added: + ----- Method: CogAbstractInstruction>>maybeRestoreVarBase (in category 'abstract instructions') ----- + maybeRestoreVarBase + "If the receiver has a VarBaseReg, generate the code to pop its value. + By default do nothing." + <inline: true>! Item was added: + ----- Method: CogAbstractInstruction>>maybeSaveVarBase (in category 'abstract instructions') ----- + maybeSaveVarBase + "If the receiver has a VarBaseReg, generate the code to push its value. + By default do nothing." + <inline: true>! Item was removed: - ----- Method: CogIA32Compiler>>maybeEstablishVarBase (in category 'abstract instructions') ----- - maybeEstablishVarBase - "The receiver does not have a VarBaseReg; do nothing."! Item was removed: - ----- Method: CogMIPSELCompiler>>maybeEstablishVarBase (in category 'abstract instructions') ----- - maybeEstablishVarBase - "The receiver has a VarBaseReg; generate the code to set it to its value." - cogit MoveCq: cogit varBaseAddress R: VarBaseReg! Item was changed: ----- Method: CogX64Compiler>>maybeEstablishVarBase (in category 'abstract instructions') ----- maybeEstablishVarBase "The receiver has a VarBaseReg; generate the code to set it to its value." + <inline: true> cogit MoveCq: cogit varBaseAddress R: VarBaseReg! Item was added: + ----- Method: CogX64Compiler>>maybeRestoreVarBase (in category 'abstract instructions') ----- + maybeRestoreVarBase + "The receiver has a VarBaseReg; generate the code to pop its value." + <inline: true> + cogit PopR: VarBaseReg! Item was added: + ----- Method: CogX64Compiler>>maybeSaveVarBase (in category 'abstract instructions') ----- + maybeSaveVarBase + "The receiver has a VarBaseReg; generate the code to push its value." + <inline: true> + cogit PushR: VarBaseReg! Item was changed: ----- Method: Cogit>>generateCaptureCStackPointers: (in category 'initialization') ----- generateCaptureCStackPointers: captureFramePointer "Generate the routine that writes the current values of the C frame and stack pointers into variables. These are used to establish the C stack in trampolines back into the C run-time. This is a presumptuous quick hack for x86. It is presumptuous for two reasons. Firstly the system's frame and stack pointers may differ from those we use in generated code, e.g. on register-rich RISCs. Secondly the ABI may not support a simple frameless call as written here (for example 128-bit stack alignment on Mac OS X)." | startAddress | <inline: false> self allocateOpcodes: 32 bytecodes: 0. startAddress := methodZoneBase. + backEnd + maybeSaveVarBase; + maybeEstablishVarBase. "Must happen first; value may be used in accessing any of the following addresses" - backEnd maybeEstablishVarBase. "Must happen first; value may be used in accessing any of the following addresses" captureFramePointer ifTrue: [self MoveR: FPReg Aw: self cFramePointerAddress]. "Capture the stack pointer prior to the call." backEnd leafCallStackPointerDelta = 0 ifTrue: [self MoveR: SPReg Aw: self cStackPointerAddress] ifFalse: [self MoveR: SPReg R: TempReg. self AddCq: backEnd leafCallStackPointerDelta R: TempReg. self MoveR: TempReg Aw: self cStackPointerAddress]. + backEnd + maybeRestoreVarBase. self RetN: 0. self outputInstructionsForGeneratedRuntimeAt: startAddress. processor flushICacheFrom: startAddress asUnsignedInteger to: methodZoneBase asUnsignedInteger. self recordGeneratedRunTime: 'ceCaptureCStackPointers' address: startAddress. ceCaptureCStackPointers := self cCoerceSimple: startAddress to: #'void (*)(void)'!

1 0

[commit][3548] CogVM source as per VMMaker.oscog-eem.1625.
by commits＠squeakvm.org 09 Jan '16

09 Jan '16

Revision: 3548 Author: eliot Date: 2016-01-09 10:55:57 -0800 (Sat, 09 Jan 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1625. Fix inclusion of SmallFloat prims. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c 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/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2016-01-09 16:25:07 UTC (rev 3547) +++ branches/Cog/nsspursrc/vm/cogit.h 2016-01-09 18:55:57 UTC (rev 3548) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 + CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-01-09 16:25:07 UTC (rev 3547) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-01-09 18:55:57 UTC (rev 3548) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 + CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 + StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -1021,8 +1021,8 @@ static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); -static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); -static sqInt NoDbgRegParms genMoveTrueR(sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling); static sqInt genPushClosureTempsBytecode(void); @@ -10565,12 +10565,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -15623,7 +15623,7 @@ /* FP jumps are a little weird */ jumpCond = jumpOpcodeGenerator(0); - /* begin genMoveConstant:R: */ + /* begin genMoveFalseR: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -15639,7 +15639,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); + jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -16449,7 +16449,7 @@ /* begin CmpR:R: */ genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg); jumpTrue = genConditionalBranchoperand(jumpOpcode, 0); - /* begin genMoveConstant:R: */ + /* begin genMoveFalseR: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -16465,7 +16465,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpTrue, genMoveConstantR(trueObject(), ReceiverResultReg)); + jmpTarget(jumpTrue, genMoveTrueR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -16520,7 +16520,7 @@ /* FP jumps are a little weird */ jumpCond = jumpFPOpcodeGenerator(0); - /* begin genMoveConstant:R: */ + /* begin genMoveFalseR: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -16536,7 +16536,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg)); + jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -20408,7 +20408,7 @@ /* begin JumpNonZero: */ jumpCmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0)); } - /* begin genMoveConstant:R: */ + /* begin genMoveTrueR: */ constant = trueObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -20424,7 +20424,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCmp, genMoveConstantR(falseObject(), ReceiverResultReg)); + jmpTarget(jumpCmp, genMoveFalseR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -23541,12 +23541,15 @@ return 0; } - /* SimpleStackBasedCogit>>#genMoveConstant:R: */ + /* SimpleStackBasedCogit>>#genMoveFalseR: */ static AbstractInstruction * NoDbgRegParms -genMoveConstantR(sqInt constant, sqInt reg) +genMoveFalseR(sqInt reg) { AbstractInstruction *anInstruction; + sqInt constant; + /* begin genMoveConstant:R: */ + constant = falseObject(); return (shouldAnnotateObjectReference(constant) ? annotateobjRef(gMoveCwR(constant, reg), constant) : (/* begin MoveCq:R: */ @@ -23558,7 +23561,7 @@ } /* SimpleStackBasedCogit>>#genMoveTrueR: */ -static sqInt NoDbgRegParms +static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg) { AbstractInstruction *anInstruction; Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-01-09 16:25:07 UTC (rev 3547) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-01-09 18:55:57 UTC (rev 3548) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 + CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 + StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -941,7 +941,7 @@ static sqInt genLongUnconditionalBackwardJump(void); static sqInt genLongUnconditionalForwardJump(void); static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs); -static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg); +static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg); static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg); static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling); @@ -3197,7 +3197,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset15) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset15) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset15) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpLongNonZero: @@ -3237,7 +3237,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case Jump: @@ -3302,7 +3302,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpNonNegative: @@ -3340,7 +3340,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset110) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset110) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset110) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpOverflow: @@ -3378,7 +3378,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset111) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset111) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset111) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpNoOverflow: @@ -3416,7 +3416,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset112) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset112) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset112) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpCarry: @@ -3456,7 +3456,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset113) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset113) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset113) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpNoCarry: @@ -3496,7 +3496,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset114) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset114) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset114) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpLess: @@ -3534,7 +3534,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset115) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset115) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset115) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpGreaterOrEqual: @@ -3572,7 +3572,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset116) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset116) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset116) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpGreater: @@ -3610,7 +3610,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset117) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset117) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset117) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpLessOrEqual: @@ -3648,7 +3648,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset118) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset118) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset118) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpAbove: @@ -3687,7 +3687,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset119) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset119) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset119) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpBelowOrEqual: @@ -3726,7 +3726,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset120) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset120) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset120) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpFPOrdered: @@ -3764,7 +3764,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset121) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset121) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset121) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case JumpFPUnordered: @@ -3802,7 +3802,7 @@ ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset122) >> 8) & 0xFF); ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset122) >> 16) & 0xFF); ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset122) >> 24) & 0xFF); - ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6))); + ((self_in_dispatchConcretize->machineCodeSize) = 6); return; case RetN: @@ -9625,12 +9625,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -14649,7 +14649,7 @@ /* FP jumps are a little weird */ jumpCond = jumpOpcodeGenerator(0); - /* begin genMoveConstant:R: */ + /* begin genMoveFalseR: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -15292,7 +15292,6 @@ jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); genRemoveSmallIntegerTagsInScratchReg(Arg1Reg); - /* begin MulR:R: */ genMulRR(backEnd, Arg1Reg, ClassReg); /* begin JumpOverflow: */ jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0)); @@ -15433,7 +15432,7 @@ /* begin CmpR:R: */ genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg); jumpTrue = genConditionalBranchoperand(jumpOpcode, 0); - /* begin genMoveConstant:R: */ + /* begin genMoveFalseR: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -15501,7 +15500,7 @@ /* FP jumps are a little weird */ jumpCond = jumpFPOpcodeGenerator(0); - /* begin genMoveConstant:R: */ + /* begin genMoveFalseR: */ constant = falseObject(); if (shouldAnnotateObjectReference(constant)) { annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant); @@ -18629,7 +18628,7 @@ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ genoperand(RetN, 0); - jmpTarget(jumpCmp, genMoveConstantR(falseObject(), ReceiverResultReg)); + jmpTarget(jumpCmp, genMoveFalseR(ReceiverResultReg)); /* begin genPrimReturn */ assert(methodOrBlockNumArgs <= (numRegArgs())); /* begin RetN: */ @@ -20836,12 +20835,15 @@ return 0; } - /* SimpleStackBasedCogit>>#genMoveConstant:R: */ + /* SimpleStackBasedCogit>>#genMoveFalseR: */ static AbstractInstruction * NoDbgRegParms -genMoveConstantR(sqInt constant, sqInt reg) +genMoveFalseR(sqInt reg) { AbstractInstruction *anInstruction; + sqInt constant; + /* begin genMoveConstant:R: */ + constant = falseObject(); return (shouldAnnotateObjectReference(constant) ? annotateobjRef(gMoveCwR(constant, reg), constant) : (/* begin MoveCq:R: */ Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-01-09 16:25:07 UTC (rev 3547) +++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-01-09 18:55:57 UTC (rev 3548) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 + CCodeGenerator VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 + StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1621 uuid: 45817ea7-f2d1-4538-bfe4-c748be944bf2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -759,7 +759,7 @@ static sqInt NoDbgRegParms computeMaximumSize(AbstractInstruction * self_in_computeMaximumSize); static usqInt NoDbgRegParms concretizeAddCheckOverflowCqR(AbstractInstruction * self_in_concretizeAddCheckOverflowCqR); static usqInt NoDbgRegParms concretizeAddCheckOverflowRR(AbstractInstruction * self_in_concretizeAddCheckOverflowRR); -static usqInt NoDbgRegParms concretizeAddCqR(AbstractInstruction * self_in_concretizeAddCqR); +static sqInt NoDbgRegParms concretizeAddCqR(AbstractInstruction * self_in_concretizeAddCqR); static usqInt NoDbgRegParms concretizeAddCwR(AbstractInstruction * self_in_concretizeAddCwR); static usqInt NoDbgRegParms concretizeAddRR(AbstractInstruction * self_in_concretizeAddRR); static AbstractInstruction * NoDbgRegParms concretizeAlignmentNops(AbstractInstruction * self_in_concretizeAlignmentNops); @@ -791,7 +791,7 @@ static usqInt NoDbgRegParms concretizeFill32(AbstractInstruction * self_in_concretizeFill32); static usqInt NoDbgRegParms concretizeJump(AbstractInstruction * self_in_concretizeJump); static usqInt NoDbgRegParms concretizeJumpFull(AbstractInstruction * self_in_concretizeJumpFull); -static usqInt NoDbgRegParms concretizeJumpLong(AbstractInstruction * self_in_concretizeJumpLong); +static sqInt NoDbgRegParms concretizeJumpLong(AbstractInstruction * self_in_concretizeJumpLong); static sqInt NoDbgRegParms concretizeJumpLongNonZero(AbstractInstruction * self_in_concretizeJumpLongNonZero); static sqInt NoDbgRegParms concretizeJumpLongZero(AbstractInstruction * self_in_concretizeJumpLongZero); static sqInt NoDbgRegParms concretizeJumpNonZero(AbstractInstruction * self_in_concretizeJumpNonZero); @@ -814,7 +814,7 @@ static usqInt NoDbgRegParms concretizeLogicalShiftRightRR(AbstractInstruction * self_in_concretizeLogicalShiftRightRR); static usqInt NoDbgRegParms concretizeMoveAbR(AbstractInstruction * self_in_concretizeMoveAbR); static usqInt NoDbgRegParms concretizeMoveAwR(AbstractInstruction * self_in_concretizeMoveAwR); -static sqInt NoDbgRegParms concretizeMoveCqR(AbstractInstruction * self_in_concretizeMoveCqR); +static usqInt NoDbgRegParms concretizeMoveCqR(AbstractInstruction * self_in_concretizeMoveCqR); static usqInt NoDbgRegParms concretizeMoveCwR(AbstractInstruction * self_in_concretizeMoveCwR); static usqInt NoDbgRegParms concretizeMoveHighR(AbstractInstruction * self_in_concretizeMoveHighR); static usqInt NoDbgRegParms concretizeMoveLowR(AbstractInstruction * self_in_concretizeMoveLowR); @@ -832,7 +832,7 @@ static usqInt NoDbgRegParms concretizeMulCheckOverflowRR(AbstractInstruction * self_in_concretizeMulCheckOverflowRR); static usqInt NoDbgRegParms concretizeNegateR(AbstractInstruction * self_in_concretizeNegateR); static usqInt NoDbgRegParms concretizeNop(AbstractInstruction * self_in_concretizeNop); -static usqInt NoDbgRegParms concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR); +static sqInt NoDbgRegParms concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR); static usqInt NoDbgRegParms concretizeOrCwR(AbstractInstruction * self_in_concretizeOrCwR); static usqInt NoDbgRegParms concretizeOrRR(AbstractInstruction * self_in_concretizeOrRR); static usqInt NoDbgRegParms concretizePopR(AbstractInstruction * self_in_concretizePopR); @@ -847,7 +847,7 @@ static usqInt NoDbgRegParms concretizeSubCqR(AbstractInstruction * self_in_concretizeSubCqR); static usqInt NoDbgRegParms concretizeSubCwR(AbstractInstruction * self_in_concretizeSubCwR); static usqInt NoDbgRegParms concretizeSubRR(AbstractInstruction * self_in_concretizeSubRR); -static usqInt NoDbgRegParms concretizeTstCqR(AbstractInstruction * self_in_concretizeTstCqR); +static sqInt NoDbgRegParms concretizeTstCqR(AbstractInstruction * self_in_concretizeTstCqR); static usqInt NoDbgRegParms concretizeTstCwR(AbstractInstruction * self_in_concretizeTstCwR); static sqInt NoDbgRegParms concretizeUnimplemented(AbstractInstruction * self_in_concretizeUnimplemented); static usqInt NoDbgRegParms concretizeXorCwR(AbstractInstruction * self_in_concretizeXorCwR); @@ -1048,7 +1048,7 @@ static sqInt NoDbgRegParms genGetClassIndexOfNonImminto(sqInt sourceReg, sqInt destReg); static sqInt NoDbgRegParms genGetClassObjectOfClassIndexintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver); -static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); +static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt NoDbgRegParms genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg); static sqInt NoDbgRegParms genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg); static sqInt NoDbgRegParms genGetFormatOfinto(sqInt srcReg, sqInt destReg); @@ -5742,12 +5742,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - sqInt delta; + usqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - sqInt location; - sqInt mapEntry; + usqInt location; + usqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -10987,7 +10987,7 @@ } /* CogMIPSELCompiler>>#concretizeAddCqR */ -static usqInt NoDbgRegParms +static sqInt NoDbgRegParms concretizeAddCqR(AbstractInstruction * self_in_concretizeAddCqR) { sqInt aWord; @@ -11841,7 +11841,7 @@ } /* CogMIPSELCompiler>>#concretizeJumpLong */ -static usqInt NoDbgRegParms +static sqInt NoDbgRegParms concretizeJumpLong(AbstractInstruction * self_in_concretizeJumpLong) { return concretizeJumpFull(self_in_concretizeJumpLong); @@ -12156,7 +12156,7 @@ } /* CogMIPSELCompiler>>#concretizeMoveCqR */ -static sqInt NoDbgRegParms +static usqInt NoDbgRegParms concretizeMoveCqR(AbstractInstruction * self_in_concretizeMoveCqR) { sqInt aWord; @@ -12551,7 +12551,7 @@ } /* CogMIPSELCompiler>>#concretizeOrCqR */ -static usqInt NoDbgRegParms +static sqInt NoDbgRegParms concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR) { sqInt aWord; @@ -12880,7 +12880,7 @@ } /* CogMIPSELCompiler>>#concretizeTstCqR */ -static usqInt NoDbgRegParms +static sqInt NoDbgRegParms concretizeTstCqR(AbstractInstruction * self_in_concretizeTstCqR) { sqInt aWord; @@ -15638,6 +15638,7 @@ jumpNotSI = genJumpNotSmallInteger(Arg0Reg); genShiftAwaySmallIntegerTagsInScratchReg(ClassReg); genRemoveSmallIntegerTagsInScratchReg(Arg1Reg); + /* begin MulR:R: */ genMulRR(backEnd, Arg1Reg, ClassReg); /* begin JumpOverflow: */ jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0)); @@ -18499,7 +18500,7 @@ } /* CogObjectRepresentationForSpur>>#genGetClassTagOf:into:scratchReg: */ -static AbstractInstruction * NoDbgRegParms +static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg) { return genGetInlineCacheClassTagFromintoforEntry(instReg, destReg, 1); Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2016-01-09 16:25:07 UTC (rev 3547) +++ branches/Cog/nsspursrc/vm/cointerp.c 2016-01-09 18:55:57 UTC (rev 3548) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 from - CoInterpreter VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 + CoInterpreter VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2399,7 +2399,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1623"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1625"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -58685,7 +58685,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -63200,7 +63200,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -63437,7 +63437,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -63752,8 +63752,8 @@ { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2016-01-09 16:25:07 UTC (rev 3547) +++ branches/Cog/nsspursrc/vm/cointerp.h 2016-01-09 18:55:57 UTC (rev 3548) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-01-09 16:25:07 UTC (rev 3547) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2016-01-09 18:55:57 UTC (rev 3548) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 from - CoInterpreter VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 + CoInterpreter VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2402,7 +2402,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1623"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1625"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -58694,7 +58694,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -63209,7 +63209,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -63446,7 +63446,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -63761,8 +63761,8 @@ { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-01-09 16:25:07 UTC (rev 3547) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2016-01-09 18:55:57 UTC (rev 3548) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 from - StackInterpreter VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 + StackInterpreter VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1623 uuid: 796c33c7-b025-4e0c-bd4e-1d3fa3d71f22 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1625 uuid: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -564,6 +564,25 @@ static void primitiveSize(void); static void primitiveSizeInBytes(void); static void primitiveSizeInBytesOfInstance(void); +static void primitiveSmallFloatAdd(void); +static void primitiveSmallFloatArctan(void); +static void primitiveSmallFloatDivide(void); +static void primitiveSmallFloatEqual(void); +static void primitiveSmallFloatExp(void); +static void primitiveSmallFloatExponent(void); +static void primitiveSmallFloatFractionalPart(void); +static void primitiveSmallFloatGreaterOrEqual(void); +static void primitiveSmallFloatGreaterThan(void); +static void primitiveSmallFloatLessOrEqual(void); +static void primitiveSmallFloatLessThan(void); +static void primitiveSmallFloatLogN(void); +static void primitiveSmallFloatMultiply(void); +static void primitiveSmallFloatNotEqual(void); +static void primitiveSmallFloatSine(void); +static void primitiveSmallFloatSquareRoot(void); +static void primitiveSmallFloatSubtract(void); +static void primitiveSmallFloatTimesTwoPower(void); +static void primitiveSmallFloatTruncated(void); static void primitiveSnapshot(void); static void primitiveSnapshotEmbedded(void); static void primitiveSomeInstance(void); @@ -605,6 +624,7 @@ static usqInt NoDbgRegParms bytesInObject(sqInt objOop); static sqInt NoDbgRegParms changeClassOfto(sqInt rcvr, sqInt argClass); static double NoDbgRegParms dbgFloatValueOf(sqInt oop); +static sqInt NoDbgRegParms exponentOfSmallFloat(sqInt oop); extern sqInt floatObjectOf(double aFloat); extern double floatValueOf(sqInt oop); static sqInt NoDbgRegParms initFreeChunkWithBytesat(usqLong numBytes, sqInt address); @@ -617,10 +637,12 @@ extern sqInt isIntegerValue(sqInt intValue); extern sqInt isMarked(sqInt objOop); static sqInt NoDbgRegParms isSmallFloatValue(double aFloat); +static sqInt NoDbgRegParms isSmallFloatZero(sqInt aSmallFloat); static sqInt NoDbgRegParms lengthOfformat(sqInt objOop, sqInt fmt); static sqInt maxSlotsForAlloc(void); static sqInt numFreeLists(void); static sqInt NoDbgRegParms objectAfterlimit(sqInt objOop, sqInt limit); +static double NoDbgRegParms smallFloatValueOf(sqInt oop); extern usqInt smallObjectBytesForSlots(sqInt numSlots); static sqInt wordIndexableFormat(void); static void NoDbgRegParms NeverInline addToEphemeronList(sqInt ephemeronCorpse); @@ -1376,10 +1398,10 @@ _iss usqInt newSpaceLimit; _iss sqInt weaklingStack; _iss sqInt trueObj; +_iss sqInt falseObj; _iss SpurSegmentInfo * segments; _iss sqInt hiddenRootsObj; _iss sqInt lkupClassTag; -_iss sqInt falseObj; _iss usqInt totalFreeOldSpace; _iss usqInt pastSpaceStart; _iss sqInt needGCFlag; @@ -2107,25 +2129,25 @@ /* 538 */ (void (*)(void))0, /* 539 */ (void (*)(void))0, /* 540 */ (void (*)(void))0, - /* 541 */ (void (*)(void))0, - /* 542 */ (void (*)(void))0, - /* 543 */ (void (*)(void))0, - /* 544 */ (void (*)(void))0, - /* 545 */ (void (*)(void))0, - /* 546 */ (void (*)(void))0, - /* 547 */ (void (*)(void))0, - /* 548 */ (void (*)(void))0, - /* 549 */ (void (*)(void))0, - /* 550 */ (void (*)(void))0, - /* 551 */ (void (*)(void))0, - /* 552 */ (void (*)(void))0, - /* 553 */ (void (*)(void))0, - /* 554 */ (void (*)(void))0, - /* 555 */ (void (*)(void))0, - /* 556 */ (void (*)(void))0, - /* 557 */ (void (*)(void))0, - /* 558 */ (void (*)(void))0, - /* 559 */ (void (*)(void))0, + /* 541 */ primitiveSmallFloatAdd, + /* 542 */ primitiveSmallFloatSubtract, + /* 543 */ primitiveSmallFloatLessThan, + /* 544 */ primitiveSmallFloatGreaterThan, + /* 545 */ primitiveSmallFloatLessOrEqual, + /* 546 */ primitiveSmallFloatGreaterOrEqual, + /* 547 */ primitiveSmallFloatEqual, + /* 548 */ primitiveSmallFloatNotEqual, + /* 549 */ primitiveSmallFloatMultiply, + /* 550 */ primitiveSmallFloatDivide, + /* 551 */ primitiveSmallFloatTruncated, + /* 552 */ primitiveSmallFloatFractionalPart, + /* 553 */ primitiveSmallFloatExponent, + /* 554 */ primitiveSmallFloatTimesTwoPower, + /* 555 */ primitiveSmallFloatSquareRoot, + /* 556 */ primitiveSmallFloatSine, + /* 557 */ primitiveSmallFloatArctan, + /* 558 */ primitiveSmallFloatLogN, + /* 559 */ primitiveSmallFloatExp, /* 560 */ (void (*)(void))0, /* 561 */ (void (*)(void))0, /* 562 */ (void (*)(void))0, @@ -2144,7 +2166,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1623"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1625"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -25452,7 +25474,1006 @@ GIV(stackPointer) = sp1; } + /* InterpreterPrimitives>>#primitiveSmallFloatAdd */ +static void +primitiveSmallFloatAdd(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + double arg; + sqInt bits; + sqInt bits1; + sqInt floatOrIntOop; + sqInt oop; + double rcvr; + double result; + sqInt rot; + sqInt rot1; + sqInt shift; + char *sp; + sqInt tagBits; + /* begin smallFloatValueOf: */ + oop = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + assert(isImmediateFloat(oop)); + rot = ((usqInt) (((usqInt)oop))) >> (numTagBits()); + if (rot > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot = (((long)rot) << 0x3F) + (((usqInt) (((unsigned long)rot))) >> 1); + bits = rot; + rcvr = (((double *) ((&bits))))[0]; + /* begin loadFloatOrIntFrom: */ + floatOrIntOop = longAt(GIV(stackPointer)); + if (((tagBits = floatOrIntOop & (tagMask()))) != 0) { + if (tagBits == (smallFloatTag())) { + /* begin smallFloatValueOf: */ + assert(isImmediateFloat(floatOrIntOop)); + rot1 = ((usqInt) (((usqInt)floatOrIntOop))) >> (numTagBits()); + if (rot1 > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot1 += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot1 = (((long)rot1) << 0x3F) + (((usqInt) (((unsigned long)rot1))) >> 1); + bits1 = rot1; + arg = (((double *) ((&bits1))))[0]; + goto l1; + } + if ((tagBits == 1) + && (((shift = (64 - (numTagBits())) - (smallFloatMantissaBits())), + (((sqInt) (((long)floatOrIntOop) << shift)) >> shift) == floatOrIntOop))) { + arg = ((double) ((floatOrIntOop >> 3)) ); + goto l1; + } + } + else { + if (((longAt(floatOrIntOop)) & (classIndexMask())) == ClassFloatCompactIndex) { + fetchFloatAtinto(floatOrIntOop + BaseHeaderSize, result); + arg = result; + goto l1; + } + } + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } + arg = 0.0; +l1: /* end loadFloatOrIntFrom: */; + if (!GIV(primFailCode)) { + /* begin pop:thenPushFloat: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr + arg)); + GIV(stackPointer) = sp; + } +} + + /* InterpreterPrimitives>>#primitiveSmallFloatArctan */ +static void +primitiveSmallFloatArctan(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt bits; + double f; + sqInt oop; + double rcvr; + sqInt rot; + char *sp; + + /* begin smallFloatValueOf: */ + oop = longAt(GIV(stackPointer)); + assert(isImmediateFloat(oop)); + rot = ((usqInt) (((usqInt)oop))) >> (numTagBits()); + if (rot > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot = (((long)rot) << 0x3F) + (((usqInt) (((unsigned long)rot))) >> 1); + bits = rot; + rcvr = (((double *) ((&bits))))[0]; + /* begin pop:thenPushFloat: */ + f = atan(rcvr); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), floatObjectOf(f)); + GIV(stackPointer) = sp; +} + + /* InterpreterPrimitives>>#primitiveSmallFloatDivide */ +static void +primitiveSmallFloatDivide(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + double arg; + sqInt bits; + sqInt bits1; + sqInt floatOrIntOop; + sqInt oop; + double rcvr; + double result; + sqInt rot; + sqInt rot1; + sqInt shift; + char *sp; + sqInt tagBits; + + /* begin smallFloatValueOf: */ + oop = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + assert(isImmediateFloat(oop)); + rot = ((usqInt) (((usqInt)oop))) >> (numTagBits()); + if (rot > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot = (((long)rot) << 0x3F) + (((usqInt) (((unsigned long)rot))) >> 1); + bits = rot; + rcvr = (((double *) ((&bits))))[0]; + /* begin loadFloatOrIntFrom: */ + floatOrIntOop = longAt(GIV(stackPointer)); + if (((tagBits = floatOrIntOop & (tagMask()))) != 0) { + if (tagBits == (smallFloatTag())) { + /* begin smallFloatValueOf: */ + assert(isImmediateFloat(floatOrIntOop)); + rot1 = ((usqInt) (((usqInt)floatOrIntOop))) >> (numTagBits()); + if (rot1 > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot1 += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot1 = (((long)rot1) << 0x3F) + (((usqInt) (((unsigned long)rot1))) >> 1); + bits1 = rot1; + arg = (((double *) ((&bits1))))[0]; + goto l1; + } + if ((tagBits == 1) + && (((shift = (64 - (numTagBits())) - (smallFloatMantissaBits())), + (((sqInt) (((long)floatOrIntOop) << shift)) >> shift) == floatOrIntOop))) { + arg = ((double) ((floatOrIntOop >> 3)) ); + goto l1; + } + } + else { + if (((longAt(floatOrIntOop)) & (classIndexMask())) == ClassFloatCompactIndex) { + fetchFloatAtinto(floatOrIntOop + BaseHeaderSize, result); + arg = result; + goto l1; + } + } + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } + arg = 0.0; +l1: /* end loadFloatOrIntFrom: */; + if (arg == 0.0) { + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } + } + if (!GIV(primFailCode)) { + /* begin pop:thenPushFloat: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), floatObjectOf(rcvr / arg)); + GIV(stackPointer) = sp; + } +} + + /* InterpreterPrimitives>>#primitiveSmallFloatEqual */ +static void +primitiveSmallFloatEqual(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + double arg; + sqInt bits; + sqInt bits1; + sqInt floatOrIntOop; + sqInt oop; + double rcvr; + double result; + sqInt rot; + sqInt rot1; + sqInt shift; + char *sp; + sqInt tagBits; + + /* begin smallFloatValueOf: */ + oop = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + assert(isImmediateFloat(oop)); + rot = ((usqInt) (((usqInt)oop))) >> (numTagBits()); + if (rot > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot = (((long)rot) << 0x3F) + (((usqInt) (((unsigned long)rot))) >> 1); + bits = rot; + rcvr = (((double *) ((&bits))))[0]; + /* begin loadFloatOrIntFrom: */ + floatOrIntOop = longAt(GIV(stackPointer)); + if (((tagBits = floatOrIntOop & (tagMask()))) != 0) { + if (tagBits == (smallFloatTag())) { + /* begin smallFloatValueOf: */ + assert(isImmediateFloat(floatOrIntOop)); + rot1 = ((usqInt) (((usqInt)floatOrIntOop))) >> (numTagBits()); + if (rot1 > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot1 += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot1 = (((long)rot1) << 0x3F) + (((usqInt) (((unsigned long)rot1))) >> 1); + bits1 = rot1; + arg = (((double *) ((&bits1))))[0]; + goto l1; + } + if ((tagBits == 1) + && (((shift = (64 - (numTagBits())) - (smallFloatMantissaBits())), + (((sqInt) (((long)floatOrIntOop) << shift)) >> shift) == floatOrIntOop))) { + arg = ((double) ((floatOrIntOop >> 3)) ); + goto l1; + } + } + else { + if (((longAt(floatOrIntOop)) & (classIndexMask())) == ClassFloatCompactIndex) { + fetchFloatAtinto(floatOrIntOop + BaseHeaderSize, result); + arg = result; + goto l1; + } + } + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } + arg = 0.0; +l1: /* end loadFloatOrIntFrom: */; + if (!GIV(primFailCode)) { + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), (rcvr == arg + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; + } +} + + +/* Computes E raised to the receiver power. + Since SmallFloats cannot represent NaNs there's no need to special case. */ + + /* InterpreterPrimitives>>#primitiveSmallFloatExp */ +static void +primitiveSmallFloatExp(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + double f; + char *sp; + + /* begin pop:thenPushFloat: */ + f = exp(smallFloatValueOf(longAt(GIV(stackPointer)))); + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), floatObjectOf(f)); + GIV(stackPointer) = sp; +} + + +/* Answer the exponent part of this float. */ + + /* InterpreterPrimitives>>#primitiveSmallFloatExponent */ +static void +primitiveSmallFloatExponent(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt integerVal; + char *sp; + + /* begin pop:thenPushInteger: */ + integerVal = (exponentOfSmallFloat(longAt(GIV(stackPointer)))) - 1; + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), ((integerVal << 3) | 1)); + GIV(stackPointer) = sp; +} + + /* InterpreterPrimitives>>#primitiveSmallFloatFractionalPart */ +static void +primitiveSmallFloatFractionalPart(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt bits; + double frac; + sqInt oop; + double rcvr; + sqInt rot; + char *sp; + double trunc; + + /* begin smallFloatValueOf: */ + oop = longAt(GIV(stackPointer)); + assert(isImmediateFloat(oop)); + rot = ((usqInt) (((usqInt)oop))) >> (numTagBits()); + if (rot > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot = (((long)rot) << 0x3F) + (((usqInt) (((unsigned long)rot))) >> 1); + bits = rot; + rcvr = (((double *) ((&bits))))[0]; + frac = modf(rcvr, (&trunc)); + /* begin pop:thenPushFloat: */ + longAtput((sp = GIV(stackPointer) + ((1 - 1) * BytesPerWord)), floatObjectOf(frac)); + GIV(stackPointer) = sp; +} + + /* InterpreterPrimitives>>#primitiveSmallFloatGreaterOrEqual */ +static void +primitiveSmallFloatGreaterOrEqual(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + double arg; + sqInt bits; + sqInt bits1; + sqInt floatOrIntOop; + sqInt oop; + double rcvr; + double result; + sqInt rot; + sqInt rot1; + sqInt shift; + char *sp; + sqInt tagBits; + + /* begin smallFloatValueOf: */ + oop = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + assert(isImmediateFloat(oop)); + rot = ((usqInt) (((usqInt)oop))) >> (numTagBits()); + if (rot > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot = (((long)rot) << 0x3F) + (((usqInt) (((unsigned long)rot))) >> 1); + bits = rot; + rcvr = (((double *) ((&bits))))[0]; + /* begin loadFloatOrIntFrom: */ + floatOrIntOop = longAt(GIV(stackPointer)); + if (((tagBits = floatOrIntOop & (tagMask()))) != 0) { + if (tagBits == (smallFloatTag())) { + /* begin smallFloatValueOf: */ + assert(isImmediateFloat(floatOrIntOop)); + rot1 = ((usqInt) (((usqInt)floatOrIntOop))) >> (numTagBits()); + if (rot1 > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot1 += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot1 = (((long)rot1) << 0x3F) + (((usqInt) (((unsigned long)rot1))) >> 1); + bits1 = rot1; + arg = (((double *) ((&bits1))))[0]; + goto l1; + } + if ((tagBits == 1) + && (((shift = (64 - (numTagBits())) - (smallFloatMantissaBits())), + (((sqInt) (((long)floatOrIntOop) << shift)) >> shift) == floatOrIntOop))) { + arg = ((double) ((floatOrIntOop >> 3)) ); + goto l1; + } + } + else { + if (((longAt(floatOrIntOop)) & (classIndexMask())) == ClassFloatCompactIndex) { + fetchFloatAtinto(floatOrIntOop + BaseHeaderSize, result); + arg = result; + goto l1; + } + } + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } + arg = 0.0; +l1: /* end loadFloatOrIntFrom: */; + if (!GIV(primFailCode)) { + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), (rcvr >= arg + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; + } +} + + /* InterpreterPrimitives>>#primitiveSmallFloatGreaterThan */ +static void +primitiveSmallFloatGreaterThan(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + double arg; + sqInt bits; + sqInt bits1; + sqInt floatOrIntOop; + sqInt oop; + double rcvr; + double result; + sqInt rot; + sqInt rot1; + sqInt shift; + char *sp; + sqInt tagBits; + + /* begin smallFloatValueOf: */ + oop = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + assert(isImmediateFloat(oop)); + rot = ((usqInt) (((usqInt)oop))) >> (numTagBits()); + if (rot > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot = (((long)rot) << 0x3F) + (((usqInt) (((unsigned long)rot))) >> 1); + bits = rot; + rcvr = (((double *) ((&bits))))[0]; + /* begin loadFloatOrIntFrom: */ + floatOrIntOop = longAt(GIV(stackPointer)); + if (((tagBits = floatOrIntOop & (tagMask()))) != 0) { + if (tagBits == (smallFloatTag())) { + /* begin smallFloatValueOf: */ + assert(isImmediateFloat(floatOrIntOop)); + rot1 = ((usqInt) (((usqInt)floatOrIntOop))) >> (numTagBits()); + if (rot1 > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot1 += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot1 = (((long)rot1) << 0x3F) + (((usqInt) (((unsigned long)rot1))) >> 1); + bits1 = rot1; + arg = (((double *) ((&bits1))))[0]; + goto l1; + } + if ((tagBits == 1) + && (((shift = (64 - (numTagBits())) - (smallFloatMantissaBits())), + (((sqInt) (((long)floatOrIntOop) << shift)) >> shift) == floatOrIntOop))) { + arg = ((double) ((floatOrIntOop >> 3)) ); + goto l1; + } + } + else { + if (((longAt(floatOrIntOop)) & (classIndexMask())) == ClassFloatCompactIndex) { + fetchFloatAtinto(floatOrIntOop + BaseHeaderSize, result); + arg = result; + goto l1; + } + } + /* begin primitiveFail */ + if (!GIV(primFailCode)) { + GIV(primFailCode) = 1; + } + arg = 0.0; +l1: /* end loadFloatOrIntFrom: */; + if (!GIV(primFailCode)) { + /* begin pop:thenPushBool: */ + longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), (rcvr > arg + ? GIV(trueObj) + : GIV(falseObj))); + GIV(stackPointer) = sp; + } +} + + /* InterpreterPrimitives>>#primitiveSmallFloatLessOrEqual */ +static void +primitiveSmallFloatLessOrEqual(void) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + double arg; + sqInt bits; + sqInt bits1; + sqInt floatOrIntOop; + sqInt oop; + double rcvr; + double result; + sqInt rot; + sqInt rot1; + sqInt shift; + char *sp; + sqInt tagBits; + + /* begin smallFloatValueOf: */ + oop = longAt(GIV(stackPointer) + (1 * BytesPerWord)); + assert(isImmediateFloat(oop)); + rot = ((usqInt) (((usqInt)oop))) >> (numTagBits()); + if (rot > 1) { + + /* a.k.a. ~= +/-0.0 */ + rot += ((long)(smallFloatExponentOffset())) << ((smallFloatMantissaBits()) + 1); + } + rot = (((long)rot) << 0x3F) + (((usqInt) (((unsigned long)rot))) >> 1); + bits = rot; + rcvr = (((double *) ((&bits))))[0]; + /* begin loadFloatOrIntFrom: */ + floatOrIntOop = longAt(GIV(stackPointer)); + if (((tagBits = floatOrIntOop & (tagMask()))) != 0) { + if (tagBits == (smallFloatTag())) { + /* begin smallFloatValueOf: */ + assert(isImmediateFloat(floatOrIntOop)); + rot1 = ((usqInt) (((usqInt)floatOrIntOop))) >> (numTagBits()); + if (rot1 > 1) { + + /* a.k.a. ~= +/-0.0 */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1625.mcz
by commits＠source.squeak.org 09 Jan '16

09 Jan '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1625.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1625 Author: eem Time: 9 January 2016, 10:42:37.534795 am UUID: c1bd5626-30ae-42ed-b647-fdc16b18ddf6 Ancestors: VMMaker.oscog-eem.1624 and another one... =============== Diff against VMMaker.oscog-eem.1624 =============== Item was changed: ----- Method: SimpleStackBasedCogit class>>table:from: (in category 'class initialization') ----- table: primArray from: specArray "Fill in the specified entries in the primitive table." specArray do: [:spec | + (spec first <= primArray size + and: [spec second == #genFastPrimFail + or: [self objectRepresentationClass shouldIncludeMethodForSelector: spec second]]) ifTrue: - (spec second == #genFastPrimFail - or: [self objectRepresentationClass shouldIncludeMethodForSelector: spec second]) ifTrue: [(primArray at: spec first put: CogPrimitiveDescriptor new) primitiveGenerator: spec second; primNumArgs: (spec at: 3 ifAbsent: -1)]]. primArray object withIndexDo: [:generator :i| generator ifNil: [(primArray object at: i put: CogPrimitiveDescriptor new) primNumArgs: -1]]!

1 0

VM Maker: VMMaker.oscog-eem.1624.mcz
by commits＠source.squeak.org 09 Jan '16

09 Jan '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1624.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1624 Author: eem Time: 9 January 2016, 10:39:04.496004 am UUID: 9899b029-c39d-4da7-8c5b-b318c79fdbf8 Ancestors: VMMaker.oscog-eem.1623 Fix SmallFloat primitive inclusion =============== Diff against VMMaker.oscog-eem.1623 =============== Item was changed: ----- Method: SpurMemoryManager class>>initializeWithOptions: (in category 'class initialization') ----- initializeWithOptions: optionsDictionary "SpurMemoryManager initializeWithOptions: Dictionary new" {self}, (self ancilliaryClasses: optionsDictionary) do: [:aSuperclass| aSuperclass withAllSubclasses do: [:class| class initializationOptions: optionsDictionary]]. super initializeWithOptions: optionsDictionary. + initializationOptions + at: #Spur32BitMemoryManager ifAbsentPut: false; + at: #Spur64BitMemoryManager ifAbsentPut: false. self initialize. self initBytesPerWord: (self == SpurMemoryManager ifTrue: [optionsDictionary at: #BytesPerWord ifAbsent: [4]] ifFalse: [self wordSize]). self initializeObjectHeaderConstants. "Initializes BaseHeaderSize so do early" self initializeSpurObjectRepresentationConstants. self initializeSpecialObjectIndices. self initializeCompactClassIndices. self initializePrimitiveErrorCodes. SpurGenerationScavenger initialize! Item was changed: ----- Method: VMClass class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants "Falsify the `what type of VM is this?' flags that are defined in the various interp.h files, or in the case of VMBIGENDIAN the various sqConfig.h files. Subclass implementations need to include a super initializeMiscConstants" | omc | VMBIGENDIAN class. "Mention this for the benefit of CCodeGenerator>>emitCConstantsOn:" self isInterpreterClass ifTrue: [STACKVM := COGVM := COGMTVM := false]. initializationOptions ifNil: [self initializationOptions: Dictionary new]. omc := initializationOptions at: #ObjectMemory ifAbsent: nil. (omc isNil and: [self defaultObjectMemoryClass notNil]) ifTrue: [omc := initializationOptions at: #ObjectMemory put: self defaultObjectMemoryClass name]. initializationOptions at: #SqueakV3ObjectMemory "the good ole default" ifAbsentPut: (omc ifNil: [true] ifNotNil: [(Smalltalk at: omc) includesBehavior: ObjectMemory]); at: #SpurObjectMemory "the new contender" ifAbsentPut: (omc ifNil: [false] + ifNotNil: [(Smalltalk at: omc) includesBehavior: SpurMemoryManager]). - ifNotNil: [(Smalltalk at: omc) includesBehavior: SpurMemoryManager]); - at: #Spur32BitMemoryManager put: false; - at: #Spur64BitMemoryManager put: false. "Use ifAbsentPut: so that they will get copied back to the VMMaker's options and dead code will likely be eliminated." PharoVM := initializationOptions at: #PharoVM ifAbsentPut: [false]. NewspeakVM := initializationOptions at: #NewspeakVM ifAbsentPut: [false]. SistaVM := initializationOptions at: #SistaVM ifAbsentPut: [false]. MULTIPLEBYTECODESETS := initializationOptions at: #MULTIPLEBYTECODESETS ifAbsentPut: [false]. "N.B. Not yet implemented." IMMUTABILITY := initializationOptions at: #IMMUTABILITY ifAbsentPut: [false]. "These for scripts etc... Usually they should get set by an Interpreter class's initializeMiscConstantsWith:" (initializationOptions includesKey: #STACKVM) ifTrue: [STACKVM := initializationOptions at: #STACKVM]. (initializationOptions includesKey: #COGVM) ifTrue: [COGVM := initializationOptions at: #COGVM]. (initializationOptions includesKey: #COGMTVM) ifTrue: [COGMTVM := initializationOptions at: #COGMTVM]!

1 0

svn repository ran out of space
by Eliot Miranda 09 Jan '16

09 Jan '16

svn: E000028: Commit failed (details follow): svn: E000028: Can't create directory '/home/svn/squeak/db/transactions/3546-1.txn': No space left on device svn: E000028: Your commit message was left in a temporary file: svn: E000028: '/Users/eliot/oscogvm/svn-commit.2.tmp' $ svn info Path: . Working Copy Root Path: /Users/eliot/oscogvm URL: http://www.squeakvm.org/svn/squeak/branches/Cog Repository Root: http://www.squeakvm.org/svn/squeak Repository UUID: fa1542d4-bde8-0310-ad64-8ed1123d492a Can someone address this? I know, it's time to move to github. Just not /this/ weekend. _,,,^..^,,,_ best, Eliot

4 5

Saturday am insanity, xcode projects to Makefiles
by Eliot Miranda 09 Jan '16

09 Jan '16

Hi All, I just blew an hour investigating converting the xcode build files to Makefiles. I've hit a wall but I thought I'd share because a) someone might want to take a tilt at this themselves b) someone might have a nifty way around the wall So what's the issue here? Under http://www.squeakvm.org/svn/squeak/branches/Cog/{build.macos32x86,build.mac… are build directories for each configuration of cog, such as squeak.cog.v3 or newspeak.stack.spur. These contain project files. The old 10.6 Carbon UI project files are called CoreVM.xcodeproj/project.pbxproj and the new 10.8 Cocoa UI ones, currently extant for only {build.macos32x86,build.macos64x64}/squeak.cog.spur) are called SqueakCogSpur32x86.xcodeproj/project.pbxproj. There are also a bunch of projects for external plugins such as SqueakFFIPrims/SqueakFFIPrims.xcodeproj. These things are all monolithic property lists with lots of commonality and they differ only slightly, mostly to include the relevant interp.h file for the configuration. For example, build.macos32x86/squeak.cog.v3 uses src/vm/interp.h, build.macos32x86/squeak.cog.spur uses spursrc/vm/interp.h, build.macos64x64/squeak.cog.spur uses spur64src/vm/interp.h, etc. Now, if these were replaced by makefiles, they could trivially be parameterised by the relevant interp.h and lots of duplication would disappear. It would be much faster to add a new configuration, etc. So how to derive the first set of makefiles? Manually, obviously, but ghaaa, no please no. So I found GNUStep's pbxbuild. This was deprecated in 2012 and apparently applies only to xcode version 2 project files, not the version 3.2 we're using. It still builds and installs (with a little bit of effort): 1. download GNUStep Makefiles from http://wwwmain.gnustep.org/resources/downloads.php?site=ftp%3A%2F%2Fftp.gnu… 2. unpack the tar $ tar xzf ~/Downloads/gnustep-make-2.6.7.tar.gz 3. cd and build $ cd gnustep-make-2.6.7/;./configure; sudo gnumake install 4. Download pbxbuild from github $ git clone https://github.com/gnustep/pbxbuild.git pbxbuild 5. cd and build $ cd pbxbuild; GNUSTEP_MAKEFILES=/Library/GNUstep/Makefiles make -f GNUmakefile But when one tries this (-g = generate makefiles) $ cd build.macos32x86/squeak.cog.spur; ~/src/pbxbuild/pbxbuild -g SqueakCogSpur32x86.xcodeproj it outputs some errors and segfaults: 2016-01-09 09:55:44.568 pbxbuild[33864:507] -[PBPbxProject initWithFile:](146) rootObject class: __NSCFDictionary 2016-01-09 09:55:44.569 pbxbuild[33864:507] -[PBPbxProject initWithFile:](147) description: 2016-01-09 09:55:44.569 pbxbuild[33864:507] -[PBPbxProject initWithFile:](148) { buildConfigurationList = 94D95B1D0923E6810034C6F0; compatibilityVersion = "Xcode 2.4"; developmentRegion = English; hasScannedForEncodings = 1; isa = PBXProject; knownRegions = ( English, Japanese, French, German ); mainGroup = 08773EB500C6A1C4C0A80109; productRefGroup = 08773F3000C6A1C4C0A80109; projectDirPath = ""; projectRoot = ""; targets = ( 941A3B2B09AA144000C9D25A ); } 2016-01-09 09:55:44.570 pbxbuild[33864:507] -[PBPbxProject(Private) addGroupRecursivelyByKey:parentPath:](82) Examining Group with name: 'Sources' 2016-01-09 09:55:44.571 pbxbuild[33864:507] Warning: Unknown reference type '(null)' in PBXGroup! 2016-01-09 09:55:44.571 pbxbuild[33864:507] Warning: Unknown reference type '(null)' in PBXGroup! 2016-01-09 09:55:44.571 pbxbuild[33864:507] Warning: Unknown reference type '(null)' in PBXGroup! 2016-01-09 09:55:44.572 pbxbuild[33864:507] Warning: Unknown reference type '(null)' in PBXGroup! Segmentation fault: 11 Then the thought is to try parsing the project files with Smalltalk and writing the exporter myself. (In fact I tried this first cuz I suspected pbxbuild would be a bust). So one can convert a project.pbxproj file to an xml file via $ plutil -convert xml1 -o - SqueakCogSpur32x86.xcodeproj/project.pbxproj >SqueakCogSpur32x86.xml and I loaded XML_Parser. But the resulting tree is so deeply nested I gave up. The next thought was that yes, I could try and debug the pbxbuild Objective-C, but that would take time learning new tools, and it would be much nicer to use Smalltalk. So I cast around for an Objective-C to Smalltalk translator. I can't find one. There /are/ Objective-C to Java and Objective-C to Swift translators. But I'm not about to try and convert those so that I can convert the pbxbuild code to Smalltalk. But I thought there might be some folks here that have copious free time and are crazy enough to try. hence this message. good morning. _,,,^..^,,,_ best, Eliot

1 1

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 January 2016