<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">cool!<div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 11 Jan 2016, at 00:02, Eliot Miranda <<a href="mailto:eliot.miranda@gmail.com" class="">eliot.miranda@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">and this implies that the production x86_64 VM on Mac OS X is functional. There is still no FFI, Alien or otherwise, so this is still insufficient for anything other than pure Smalltalk hacking. But this is an important milestone and I should be able to release it for people to play with later next week.<br class=""><div class="gmail_extra"><br class=""><div class="gmail_quote">On Sun, Jan 10, 2016 at 2:51 PM, <span dir="ltr" class=""><<a href="mailto:commits@squeakvm.org" target="_blank" class="">commits@squeakvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br class="">
Revision: 3553<br class="">
Author: eliot<br class="">
Date: 2016-01-10 14:51:42 -0800 (Sun, 10 Jan 2016)<br class="">
Log Message:<br class="">
-----------<br class="">
CogVm source as per VMMaker.oscog-eem.1630<br class="">
<br class="">
Cogit:<br class="">
Fix the bug in ceCaptureStackPointers caused by pushing VarBasReg to save it<br class="">
offsetting the stack pointer.<br class="">
<br class="">
Eliminate all the maybe*VarBase methods since we have hasVarBaseRegister and<br class="">
the few clients can test that and hnce not have to divine if maybeSaveVarBase<br class="">
pushed something or not.<br class="">
<br class="">
On Mac IS X modify the stack alignment definitions to reflect documented<br class="">
Apple policy.<br class="">
<br class="">
Modified Paths:<br class="">
--------------<br class="">
branches/Cog/nsspursrc/vm/cogit.h<br class="">
branches/Cog/nsspursrc/vm/cogitARMv5.c<br class="">
branches/Cog/nsspursrc/vm/cogitIA32.c<br class="">
branches/Cog/nsspursrc/vm/cogitMIPSEL.c<br class="">
branches/Cog/platforms/Cross/vm/sqCogStackAlignment.h<br class="">
branches/Cog/spur64src/vm/cogit.h<br class="">
branches/Cog/spur64src/vm/cogitX64.c<br class="">
branches/Cog/spursistasrc/vm/cogit.h<br class="">
branches/Cog/spursistasrc/vm/cogitARMv5.c<br class="">
branches/Cog/spursistasrc/vm/cogitIA32.c<br class="">
branches/Cog/spursistasrc/vm/cogitMIPSEL.c<br class="">
branches/Cog/spursrc/vm/cogit.h<br class="">
branches/Cog/spursrc/vm/cogitARMv5.c<br class="">
branches/Cog/spursrc/vm/cogitIA32.c<br class="">
branches/Cog/spursrc/vm/cogitMIPSEL.c<br class="">
branches/Cog/src/vm/cogit.h<br class="">
branches/Cog/src/vm/cogitARMv5.c<br class="">
branches/Cog/src/vm/cogitIA32.c<br class="">
branches/Cog/src/vm/cogitMIPSEL.c<br class="">
<br class="">
Property Changed:<br class="">
----------------<br class="">
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h<br class="">
<br class="">
Modified: branches/Cog/nsspursrc/vm/cogit.h<br class="">
===================================================================<br class="">
--- branches/Cog/nsspursrc/vm/cogit.h 2016-01-10 21:49:21 UTC (rev 3552)<br class="">
+++ branches/Cog/nsspursrc/vm/cogit.h 2016-01-10 22:51:42 UTC (rev 3553)<br class="">
@@ -1,5 +1,5 @@<br class="">
/* Automatically generated by<br class="">
- CCodeGenerator VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ CCodeGenerator VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
*/<br class="">
<br class="">
<br class="">
<br class="">
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c<br class="">
===================================================================<br class="">
--- branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-01-10 21:49:21 UTC (rev 3552)<br class="">
+++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2016-01-10 22:51:42 UTC (rev 3553)<br class="">
@@ -1,9 +1,9 @@<br class="">
/* Automatically generated by<br class="">
- CCodeGenerator VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ CCodeGenerator VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
from<br class="">
- StackToRegisterMappingCogit VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
*/<br class="">
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7 " __DATE__ ;<br class="">
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab " __DATE__ ;<br class="">
char *__cogitBuildInfo = __buildInfo;<br class="">
<br class="">
<br class="">
@@ -955,7 +955,6 @@<br class="">
static sqInt endSizeOffset(void);<br class="">
static sqInt NoDbgRegParms literalInstructionInRange(AbstractInstruction *litInst);<br class="">
static AbstractInstruction * NoDbgRegParms locateLiteral(sqInt aLiteral);<br class="">
-static sqInt NoDbgRegParms mustDumpLiterals(sqInt currentOpcodeIndex);<br class="">
static sqInt resetForBlockCompile(void);<br class="">
static sqInt saveForBlockCompile(void);<br class="">
static sqInt compileBlockDispatch(void);<br class="">
@@ -10067,14 +10066,14 @@<br class="">
sqInt size;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
+ /* begin MoveCq:R: */<br class="">
quickConstant = varBaseAddress();<br class="">
/* begin gen:quickConstant:operand: */<br class="">
anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
if (usesOutOfLineLiteral(anInstruction)) {<br class="">
(anInstruction->dependent = locateLiteral(quickConstant));<br class="">
}<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+<br class="">
genLoadStackPointers(backEnd);<br class="">
if (regArg3OrNone != NoReg) {<br class="">
/* begin PopR: */<br class="">
@@ -10163,6 +10162,7 @@<br class="">
sqInt fixupSize;<br class="">
sqInt opcodeSize;<br class="">
sqInt quickConstant;<br class="">
+ sqInt quickConstant1;<br class="">
sqInt startAddress;<br class="">
<br class="">
/* begin allocateOpcodes:bytecodes: */<br class="">
@@ -10174,32 +10174,42 @@<br class="">
fixups = ((void *)((((usqInt)abstractOpcodes)) + opcodeSize));<br class="">
zeroOpcodeIndex();<br class="">
labelCounter = 0;<br class="">
+<br class="">
+ /* Must happen first; value may be used in accessing any of the following addresses */<br class="">
startAddress = methodZoneBase;<br class="">
- /* begin maybeSaveVarBase */<br class="">
+ /* begin PushR: */<br class="">
genoperand(PushR, VarBaseReg);<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- quickConstant = varBaseAddress();<br class="">
+ /* begin MoveCq:R: */<br class="">
+ quickConstant1 = varBaseAddress();<br class="">
/* begin gen:quickConstant:operand: */<br class="">
- anInstruction1 = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
+ anInstruction1 = genoperandoperand(MoveCqR, quickConstant1, VarBaseReg);<br class="">
if (usesOutOfLineLiteral(anInstruction1)) {<br class="">
- (anInstruction1->dependent = locateLiteral(quickConstant));<br class="">
+ (anInstruction1->dependent = locateLiteral(quickConstant1));<br class="">
}<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+<br class="">
if (captureFramePointer) {<br class="">
/* begin MoveR:Aw: */<br class="">
address = cFramePointerAddress();<br class="">
/* begin gen:operand:literal: */<br class="">
checkLiteralforInstruction(address, genoperandoperand(MoveRAw, FPReg, address));<br class="">
}<br class="">
+ /* begin MoveR:R: */<br class="">
+ genoperandoperand(MoveRR, SPReg, TempReg);<br class="">
+ /* begin AddCq:R: */<br class="">
+ quickConstant = 0 + BytesPerWord;<br class="">
+ /* begin gen:quickConstant:operand: */<br class="">
+ anInstruction = genoperandoperand(AddCqR, quickConstant, TempReg);<br class="">
+ if (usesOutOfLineLiteral(anInstruction)) {<br class="">
+ (anInstruction->dependent = locateLiteral(quickConstant));<br class="">
+ }<br class="">
/* begin MoveR:Aw: */<br class="">
address1 = cStackPointerAddress();<br class="">
/* begin gen:operand:literal: */<br class="">
- checkLiteralforInstruction(address1, genoperandoperand(MoveRAw, SPReg, address1));<br class="">
+ checkLiteralforInstruction(address1, genoperandoperand(MoveRAw, TempReg, address1));<br class="">
<br class="">
- /* begin maybeRestoreVarBase */<br class="">
+ /* begin PopR: */<br class="">
genoperand(PopR, VarBaseReg);<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
outputInstructionsForGeneratedRuntimeAt(startAddress);<br class="">
@@ -16169,7 +16179,6 @@<br class="">
jumpNotSI = genJumpNotSmallInteger(Arg0Reg);<br class="">
genShiftAwaySmallIntegerTagsInScratchReg(ClassReg);<br class="">
genRemoveSmallIntegerTagsInScratchReg(Arg1Reg);<br class="">
- /* begin MulR:R: */<br class="">
genMulRR(backEnd, Arg1Reg, ClassReg);<br class="">
/* begin JumpOverflow: */<br class="">
jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0));<br class="">
@@ -21984,14 +21993,6 @@<br class="">
return litInst;<br class="">
}<br class="">
<br class="">
- /* OutOfLineLiteralsManager>>#mustDumpLiterals: */<br class="">
-static sqInt NoDbgRegParms<br class="">
-mustDumpLiterals(sqInt currentOpcodeIndex)<br class="">
-{<br class="">
- return (currentOpcodeIndex >= firstOpcodeIndex)<br class="">
- && ((currentOpcodeIndex - firstOpcodeIndex) >= (outOfLineLiteralOpcodeLimit(backEnd())));<br class="">
-}<br class="">
-<br class="">
/* OutOfLineLiteralsManager>>#resetForBlockCompile */<br class="">
static sqInt<br class="">
resetForBlockCompile(void)<br class="">
@@ -23445,14 +23446,14 @@<br class="">
sqInt reg;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
+ /* begin MoveCq:R: */<br class="">
quickConstant = varBaseAddress();<br class="">
/* begin gen:quickConstant:operand: */<br class="">
- anInstruction6 = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
- if (usesOutOfLineLiteral(anInstruction6)) {<br class="">
- (anInstruction6->dependent = locateLiteral(quickConstant));<br class="">
+ anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
+ if (usesOutOfLineLiteral(anInstruction)) {<br class="">
+ (anInstruction->dependent = locateLiteral(quickConstant));<br class="">
}<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+<br class="">
if (profiling) {<br class="">
<br class="">
/* Test nextProfileTick for being non-zero and call checkProfileTick: if so.<br class="">
@@ -23508,9 +23509,9 @@<br class="">
checkLiteralforInstruction(address8, genoperandoperand(MoveAwR, address8, reg));<br class="">
genLoadStackPointers(backEnd);<br class="">
/* begin MoveMw:r:R: */<br class="">
- anInstruction4 = genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg);<br class="">
- if (usesOutOfLineLiteral(anInstruction4)) {<br class="">
- (anInstruction4->dependent = locateLiteral(0));<br class="">
+ anInstruction5 = genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg);<br class="">
+ if (usesOutOfLineLiteral(anInstruction5)) {<br class="">
+ (anInstruction5->dependent = locateLiteral(0));<br class="">
}<br class="">
<br class="">
/* begin RetN: */<br class="">
@@ -24798,7 +24799,8 @@<br class="">
(fixup->targetInstruction = abstractInstructionAt(nextOpcodeIndex));<br class="">
}<br class="">
/* begin maybeDumpLiterals: */<br class="">
- if ((mustDumpLiterals(opcodeIndex))<br class="">
+ if (((opcodeIndex >= firstOpcodeIndex)<br class="">
+ && ((opcodeIndex - firstOpcodeIndex) >= (outOfLineLiteralOpcodeLimit(backEnd()))))<br class="">
|| ((isUnconditionalBranch(descriptor))<br class="">
|| ((descriptor->isReturn)))) {<br class="">
dumpLiterals(!((isUnconditionalBranch(descriptor))<br class="">
@@ -25439,14 +25441,14 @@<br class="">
sqInt size;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
+ /* begin MoveCq:R: */<br class="">
quickConstant = varBaseAddress();<br class="">
/* begin gen:quickConstant:operand: */<br class="">
anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
if (usesOutOfLineLiteral(anInstruction)) {<br class="">
(anInstruction->dependent = locateLiteral(quickConstant));<br class="">
}<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+<br class="">
genLoadStackPointers(backEnd);<br class="">
/* begin PopR: */<br class="">
genoperand(PopR, ClassReg);<br class="">
<br class="">
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c<br class="">
===================================================================<br class="">
--- branches/Cog/nsspursrc/vm/cogitIA32.c 2016-01-10 21:49:21 UTC (rev 3552)<br class="">
+++ branches/Cog/nsspursrc/vm/cogitIA32.c 2016-01-10 22:51:42 UTC (rev 3553)<br class="">
@@ -1,9 +1,9 @@<br class="">
/* Automatically generated by<br class="">
- CCodeGenerator VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ CCodeGenerator VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
from<br class="">
- StackToRegisterMappingCogit VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
*/<br class="">
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7 " __DATE__ ;<br class="">
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab " __DATE__ ;<br class="">
char *__cogitBuildInfo = __buildInfo;<br class="">
<br class="">
<br class="">
@@ -929,8 +929,7 @@<br class="">
static sqInt genLongUnconditionalForwardJump(void);<br class="">
static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs);<br class="">
static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg);<br class="">
-static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg);<br class="">
-static sqInt NoDbgRegParms genMoveTrueR(sqInt reg);<br class="">
+static AbstractInstruction * NoDbgRegParms genMoveTrueR(sqInt reg);<br class="">
static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName);<br class="">
static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling);<br class="">
static sqInt genPushClosureTempsBytecode(void);<br class="">
@@ -3148,7 +3147,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset15) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset15) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset15) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpLongNonZero:<br class="">
@@ -3188,7 +3187,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset17) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case Jump:<br class="">
@@ -3253,7 +3252,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset19) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset19) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset19) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpNonNegative:<br class="">
@@ -3291,7 +3290,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset110) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset110) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset110) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpOverflow:<br class="">
@@ -3329,7 +3328,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset111) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset111) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset111) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpNoOverflow:<br class="">
@@ -3367,7 +3366,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset112) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset112) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset112) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpCarry:<br class="">
@@ -3407,7 +3406,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset113) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset113) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset113) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpNoCarry:<br class="">
@@ -3447,7 +3446,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset114) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset114) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset114) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpLess:<br class="">
@@ -3485,7 +3484,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset115) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset115) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset115) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpGreaterOrEqual:<br class="">
@@ -3523,7 +3522,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset116) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset116) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset116) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpGreater:<br class="">
@@ -3561,7 +3560,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset117) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset117) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset117) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpLessOrEqual:<br class="">
@@ -3599,7 +3598,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset118) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset118) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset118) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpAbove:<br class="">
@@ -3638,7 +3637,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset119) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset119) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset119) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpBelowOrEqual:<br class="">
@@ -3677,7 +3676,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset120) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset120) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset120) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpFPOrdered:<br class="">
@@ -3715,7 +3714,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset121) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset121) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset121) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case JumpFPUnordered:<br class="">
@@ -3753,7 +3752,7 @@<br class="">
((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) offset122) >> 8) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset122) >> 16) & 0xFF);<br class="">
((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset122) >> 24) & 0xFF);<br class="">
- ((usqInt) (((self_in_dispatchConcretize->machineCodeSize) = 6)));<br class="">
+ ((self_in_dispatchConcretize->machineCodeSize) = 6);<br class="">
return;<br class="">
<br class="">
case RetN:<br class="">
@@ -9211,13 +9210,13 @@<br class="">
static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)<br class="">
<br class="">
{<br class="">
+ AbstractInstruction *anInstruction;<br class="">
sqInt endAddress;<br class="">
sqInt enilopmart;<br class="">
+ sqInt quickConstant;<br class="">
sqInt size;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
genLoadStackPointers(backEnd);<br class="">
if (regArg3OrNone != NoReg) {<br class="">
/* begin PopR: */<br class="">
@@ -9294,9 +9293,11 @@<br class="">
AbstractInstruction *anInstruction1;<br class="">
AbstractInstruction *anInstruction2;<br class="">
AbstractInstruction *anInstruction3;<br class="">
+ AbstractInstruction *anInstruction4;<br class="">
sqInt fixupSize;<br class="">
sqInt opcodeSize;<br class="">
sqInt quickConstant;<br class="">
+ sqInt quickConstant1;<br class="">
sqInt startAddress;<br class="">
<br class="">
/* begin allocateOpcodes:bytecodes: */<br class="">
@@ -9308,16 +9309,14 @@<br class="">
fixups = ((void *)((((usqInt)abstractOpcodes)) + opcodeSize));<br class="">
zeroOpcodeIndex();<br class="">
labelCounter = 0;<br class="">
+<br class="">
+ /* Must happen first; value may be used in accessing any of the following addresses */<br class="">
startAddress = methodZoneBase;<br class="">
- /* begin maybeSaveVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
if (captureFramePointer) {<br class="">
/* begin MoveR:Aw: */<br class="">
address = cFramePointerAddress();<br class="">
/* begin gen:operand:literal: */<br class="">
- anInstruction1 = genoperandoperand(MoveRAw, FPReg, address);<br class="">
+ anInstruction2 = genoperandoperand(MoveRAw, FPReg, address);<br class="">
}<br class="">
/* begin MoveR:R: */<br class="">
genoperandoperand(MoveRR, SPReg, TempReg);<br class="">
@@ -9326,12 +9325,10 @@<br class="">
/* begin gen:quickConstant:operand: */<br class="">
anInstruction = genoperandoperand(AddCqR, quickConstant, TempReg);<br class="">
/* begin MoveR:Aw: */<br class="">
- address2 = cStackPointerAddress();<br class="">
+ address1 = cStackPointerAddress();<br class="">
/* begin gen:operand:literal: */<br class="">
- anInstruction3 = genoperandoperand(MoveRAw, TempReg, address2);<br class="">
+ anInstruction3 = genoperandoperand(MoveRAw, TempReg, address1);<br class="">
<br class="">
- /* begin maybeRestoreVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
outputInstructionsForGeneratedRuntimeAt(startAddress);<br class="">
@@ -9554,12 +9551,12 @@<br class="">
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)<br class="">
{<br class="">
unsigned char annotation;<br class="">
- usqInt delta;<br class="">
+ sqInt delta;<br class="">
sqInt i;<br class="">
AbstractInstruction *instruction;<br class="">
sqInt length;<br class="">
- usqInt location;<br class="">
- usqInt mapEntry;<br class="">
+ sqInt location;<br class="">
+ sqInt mapEntry;<br class="">
sqInt maxDelta;<br class="">
usqInt mcpc;<br class="">
<br class="">
@@ -10912,7 +10909,8 @@<br class="">
literal = literalBeforeFollowingAddress(backEnd, mcpc);<br class="">
mappedLiteral = remapObject(literal);<br class="">
if (mappedLiteral != literal) {<br class="">
- storeLiteralbeforeFollowingAddress(backEnd, mappedLiteral, mcpc);<br class="">
+ /* begin storeLiteral:atAnnotatedAddress:using: */<br class="">
+ storeLiteralbeforeFollowingAddress(((AbstractInstruction *) backEnd), mappedLiteral, mcpc);<br class="">
codeModified = 1;<br class="">
}<br class="">
}<br class="">
@@ -12624,7 +12622,8 @@<br class="">
if (couldBeObject(literal)) {<br class="">
mappedLiteral = remapObject(literal);<br class="">
if (literal != mappedLiteral) {<br class="">
- storeLiteralbeforeFollowingAddress(backEnd, mappedLiteral, ((usqInt)mcpc));<br class="">
+ /* begin storeLiteral:atAnnotatedAddress:using: */<br class="">
+ storeLiteralbeforeFollowingAddress(((AbstractInstruction *) backEnd), mappedLiteral, ((usqInt)mcpc));<br class="">
codeModified = 1;<br class="">
}<br class="">
if ((hasYoungPtr != 0)<br class="">
@@ -14594,7 +14593,7 @@<br class="">
<br class="">
/* FP jumps are a little weird */<br class="">
jumpCond = jumpOpcodeGenerator(0);<br class="">
- /* begin genMoveFalseR: */<br class="">
+ /* begin genMoveConstant:R: */<br class="">
constant = falseObject();<br class="">
if (shouldAnnotateObjectReference(constant)) {<br class="">
annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant);<br class="">
@@ -14607,7 +14606,7 @@<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
- jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg));<br class="">
+ jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg));<br class="">
/* begin genPrimReturn */<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
@@ -15378,7 +15377,7 @@<br class="">
/* begin CmpR:R: */<br class="">
genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg);<br class="">
jumpTrue = genConditionalBranchoperand(jumpOpcode, 0);<br class="">
- /* begin genMoveFalseR: */<br class="">
+ /* begin genMoveConstant:R: */<br class="">
constant = falseObject();<br class="">
if (shouldAnnotateObjectReference(constant)) {<br class="">
annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant);<br class="">
@@ -15391,7 +15390,7 @@<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
- jmpTarget(jumpTrue, genMoveConstantR(trueObject(), ReceiverResultReg));<br class="">
+ jmpTarget(jumpTrue, genMoveTrueR(ReceiverResultReg));<br class="">
/* begin genPrimReturn */<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
@@ -15446,7 +15445,7 @@<br class="">
<br class="">
/* FP jumps are a little weird */<br class="">
jumpCond = jumpFPOpcodeGenerator(0);<br class="">
- /* begin genMoveFalseR: */<br class="">
+ /* begin genMoveConstant:R: */<br class="">
constant = falseObject();<br class="">
if (shouldAnnotateObjectReference(constant)) {<br class="">
annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant);<br class="">
@@ -15459,7 +15458,7 @@<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
- jmpTarget(jumpCond, genMoveConstantR(trueObject(), ReceiverResultReg));<br class="">
+ jmpTarget(jumpCond, genMoveTrueR(ReceiverResultReg));<br class="">
/* begin genPrimReturn */<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
@@ -18558,7 +18557,7 @@<br class="">
/* begin JumpNonZero: */<br class="">
jumpCmp = genConditionalBranchoperand(JumpNonZero, ((sqInt)0));<br class="">
}<br class="">
- /* begin genMoveConstant:R: */<br class="">
+ /* begin genMoveTrueR: */<br class="">
constant = trueObject();<br class="">
if (shouldAnnotateObjectReference(constant)) {<br class="">
annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant);<br class="">
@@ -18571,7 +18570,7 @@<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
- jmpTarget(jumpCmp, genMoveFalseR(ReceiverResultReg));<br class="">
+ jmpTarget(jumpCmp, genMoveConstantR(falseObject(), ReceiverResultReg));<br class="">
/* begin genPrimReturn */<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
@@ -20772,24 +20771,8 @@<br class="">
anInstruction));<br class="">
}<br class="">
<br class="">
- /* SimpleStackBasedCogit>>#genMoveFalseR: */<br class="">
-static AbstractInstruction * NoDbgRegParms<br class="">
-genMoveFalseR(sqInt reg)<br class="">
-{<br class="">
- AbstractInstruction *anInstruction;<br class="">
- sqInt constant;<br class="">
-<br class="">
- /* begin genMoveConstant:R: */<br class="">
- constant = falseObject();<br class="">
- return (shouldAnnotateObjectReference(constant)<br class="">
- ? annotateobjRef(gMoveCwR(constant, reg), constant)<br class="">
- : (/* begin MoveCq:R: */<br class="">
- (anInstruction = genoperandoperand(MoveCqR, constant, reg)),<br class="">
- anInstruction));<br class="">
-}<br class="">
-<br class="">
/* SimpleStackBasedCogit>>#genMoveTrueR: */<br class="">
-static sqInt NoDbgRegParms<br class="">
+static AbstractInstruction * NoDbgRegParms<br class="">
genMoveTrueR(sqInt reg)<br class="">
{<br class="">
AbstractInstruction *anInstruction;<br class="">
@@ -20846,6 +20829,7 @@<br class="">
AbstractInstruction *anInstruction15;<br class="">
AbstractInstruction *anInstruction16;<br class="">
AbstractInstruction *anInstruction17;<br class="">
+ AbstractInstruction *anInstruction18;<br class="">
AbstractInstruction *anInstruction2;<br class="">
AbstractInstruction *anInstruction3;<br class="">
AbstractInstruction *anInstruction4;<br class="">
@@ -20858,11 +20842,10 @@<br class="">
AbstractInstruction *continuePostSample;<br class="">
AbstractInstruction *jmpFail;<br class="">
AbstractInstruction *jmpSample;<br class="">
+ sqInt quickConstant;<br class="">
sqInt reg;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
if (profiling) {<br class="">
<br class="">
/* Test nextProfileTick for being non-zero and call checkProfileTick: if so.<br class="">
@@ -20870,11 +20853,11 @@<br class="">
/* begin MoveAw:R: */<br class="">
address = nextProfileTickAddress();<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction = genoperandoperand(MoveAwR, address, TempReg);<br class="">
+ anInstruction1 = genoperandoperand(MoveAwR, address, TempReg);<br class="">
/* begin MoveAw:R: */<br class="">
address1 = (nextProfileTickAddress()) + BytesPerWord;<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction1 = genoperandoperand(MoveAwR, address1, ClassReg);<br class="">
+ anInstruction2 = genoperandoperand(MoveAwR, address1, ClassReg);<br class="">
/* begin OrR:R: */<br class="">
genoperandoperand(OrRR, TempReg, ClassReg);<br class="">
<br class="">
@@ -20887,21 +20870,21 @@<br class="">
/* begin MoveAw:R: */<br class="">
address6 = primFailCodeAddress();<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction12 = genoperandoperand(MoveAwR, address6, TempReg);<br class="">
+ anInstruction13 = genoperandoperand(MoveAwR, address6, TempReg);<br class="">
flag("ask concrete code gen if move sets condition codes?");<br class="">
/* begin CmpCq:R: */<br class="">
- anInstruction13 = genoperandoperand(CmpCqR, 0, TempReg);<br class="">
+ anInstruction14 = genoperandoperand(CmpCqR, 0, TempReg);<br class="">
/* begin JumpNonZero: */<br class="">
jmpFail = genConditionalBranchoperand(JumpNonZero, ((sqInt)0));<br class="">
/* begin MoveAw:R: */<br class="">
address5 = instructionPointerAddress();<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction7 = genoperandoperand(MoveAwR, address5, ClassReg);<br class="">
+ anInstruction8 = genoperandoperand(MoveAwR, address5, ClassReg);<br class="">
genLoadStackPointers(backEnd);<br class="">
/* begin MoveMw:r:R: */<br class="">
- anInstruction8 = genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg);<br class="">
+ anInstruction9 = genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg);<br class="">
/* begin MoveR:Mw:r: */<br class="">
- anInstruction9 = genoperandoperandoperand(MoveRMwr, ClassReg, 0, SPReg);<br class="">
+ anInstruction10 = genoperandoperandoperand(MoveRMwr, ClassReg, 0, SPReg);<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
<br class="">
@@ -20909,16 +20892,16 @@<br class="">
/* begin MoveAw:R: */<br class="">
address7 = cStackPointerAddress();<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction14 = genoperandoperand(MoveAwR, address7, SPReg);<br class="">
+ anInstruction15 = genoperandoperand(MoveAwR, address7, SPReg);<br class="">
compileCallFornumArgsargargargargresultRegsaveRegs(ceActivateFailingPrimitiveMethod, 1, SendNumArgsReg, null, null, null, NoReg, 0);<br class="">
/* begin MoveAw:R: */<br class="">
address8 = instructionPointerAddress();<br class="">
reg = ClassReg;<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction15 = genoperandoperand(MoveAwR, address8, reg);<br class="">
+ anInstruction16 = genoperandoperand(MoveAwR, address8, reg);<br class="">
genLoadStackPointers(backEnd);<br class="">
/* begin MoveMw:r:R: */<br class="">
- anInstruction11 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, ReceiverResultReg);<br class="">
+ anInstruction12 = genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, ReceiverResultReg);<br class="">
/* begin PushR: */<br class="">
genoperand(PushR, ClassReg);<br class="">
<br class="">
@@ -20932,8 +20915,8 @@<br class="">
/* begin CallFullRT: */<br class="">
callTarget = (unsigned long)ceCheckProfileTick;<br class="">
/* begin annotateCall: */<br class="">
- anInstruction17 = genoperand(CallFull, callTarget);<br class="">
- abstractInstruction = anInstruction17;<br class="">
+ anInstruction18 = genoperand(CallFull, callTarget);<br class="">
+ abstractInstruction = anInstruction18;<br class="">
(abstractInstruction->annotation = IsRelativeCall);<br class="">
<br class="">
<br class="">
@@ -22805,14 +22788,14 @@<br class="">
static void (*genCallPICEnilopmartNumArgs(sqInt numArgs))(void)<br class="">
<br class="">
{<br class="">
+ AbstractInstruction *anInstruction;<br class="">
sqInt endAddress;<br class="">
sqInt enilopmart;<br class="">
+ sqInt quickConstant;<br class="">
sqInt reg;<br class="">
sqInt size;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
genLoadStackPointers(backEnd);<br class="">
/* begin PopR: */<br class="">
genoperand(PopR, ClassReg);<br class="">
<br class="">
Modified: branches/Cog/nsspursrc/vm/cogitMIPSEL.c<br class="">
===================================================================<br class="">
--- branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-01-10 21:49:21 UTC (rev 3552)<br class="">
+++ branches/Cog/nsspursrc/vm/cogitMIPSEL.c 2016-01-10 22:51:42 UTC (rev 3553)<br class="">
@@ -1,9 +1,9 @@<br class="">
/* Automatically generated by<br class="">
- CCodeGenerator VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ CCodeGenerator VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
from<br class="">
- StackToRegisterMappingCogit VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
*/<br class="">
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7 " __DATE__ ;<br class="">
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab " __DATE__ ;<br class="">
char *__cogitBuildInfo = __buildInfo;<br class="">
<br class="">
<br class="">
@@ -756,11 +756,11 @@<br class="">
static sqInt NoDbgRegParms computeMaximumSize(AbstractInstruction * self_in_computeMaximumSize);<br class="">
static usqInt NoDbgRegParms concretizeAddCheckOverflowCqR(AbstractInstruction * self_in_concretizeAddCheckOverflowCqR);<br class="">
static usqInt NoDbgRegParms concretizeAddCheckOverflowRR(AbstractInstruction * self_in_concretizeAddCheckOverflowRR);<br class="">
-static usqInt NoDbgRegParms concretizeAddCqR(AbstractInstruction * self_in_concretizeAddCqR);<br class="">
+static sqInt NoDbgRegParms concretizeAddCqR(AbstractInstruction * self_in_concretizeAddCqR);<br class="">
static usqInt NoDbgRegParms concretizeAddCwR(AbstractInstruction * self_in_concretizeAddCwR);<br class="">
static usqInt NoDbgRegParms concretizeAddRR(AbstractInstruction * self_in_concretizeAddRR);<br class="">
static AbstractInstruction * NoDbgRegParms concretizeAlignmentNops(AbstractInstruction * self_in_concretizeAlignmentNops);<br class="">
-static usqInt NoDbgRegParms concretizeAndCqR(AbstractInstruction * self_in_concretizeAndCqR);<br class="">
+static sqInt NoDbgRegParms concretizeAndCqR(AbstractInstruction * self_in_concretizeAndCqR);<br class="">
static usqInt NoDbgRegParms concretizeAndCqRR(AbstractInstruction * self_in_concretizeAndCqRR);<br class="">
static usqInt NoDbgRegParms concretizeAndCwR(AbstractInstruction * self_in_concretizeAndCwR);<br class="">
static usqInt NoDbgRegParms concretizeAndRR(AbstractInstruction * self_in_concretizeAndRR);<br class="">
@@ -779,7 +779,7 @@<br class="">
static usqInt NoDbgRegParms concretizeBrUnsignedGreaterRR(AbstractInstruction * self_in_concretizeBrUnsignedGreaterRR);<br class="">
static usqInt NoDbgRegParms concretizeBrUnsignedLessEqualRR(AbstractInstruction * self_in_concretizeBrUnsignedLessEqualRR);<br class="">
static usqInt NoDbgRegParms concretizeBrUnsignedLessRR(AbstractInstruction * self_in_concretizeBrUnsignedLessRR);<br class="">
-static usqInt NoDbgRegParms concretizeCall(AbstractInstruction * self_in_concretizeCall);<br class="">
+static sqInt NoDbgRegParms concretizeCall(AbstractInstruction * self_in_concretizeCall);<br class="">
static usqInt NoDbgRegParms concretizeCallFull(AbstractInstruction * self_in_concretizeCallFull);<br class="">
static sqInt NoDbgRegParms concretizeCmpCqR(AbstractInstruction * self_in_concretizeCmpCqR);<br class="">
static sqInt NoDbgRegParms concretizeCmpCwR(AbstractInstruction * self_in_concretizeCmpCwR);<br class="">
@@ -829,12 +829,12 @@<br class="">
static usqInt NoDbgRegParms concretizeMulCheckOverflowRR(AbstractInstruction * self_in_concretizeMulCheckOverflowRR);<br class="">
static usqInt NoDbgRegParms concretizeNegateR(AbstractInstruction * self_in_concretizeNegateR);<br class="">
static usqInt NoDbgRegParms concretizeNop(AbstractInstruction * self_in_concretizeNop);<br class="">
-static usqInt NoDbgRegParms concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR);<br class="">
+static sqInt NoDbgRegParms concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR);<br class="">
static usqInt NoDbgRegParms concretizeOrCwR(AbstractInstruction * self_in_concretizeOrCwR);<br class="">
static usqInt NoDbgRegParms concretizeOrRR(AbstractInstruction * self_in_concretizeOrRR);<br class="">
static usqInt NoDbgRegParms concretizePopR(AbstractInstruction * self_in_concretizePopR);<br class="">
static usqInt NoDbgRegParms concretizePrefetchAw(AbstractInstruction * self_in_concretizePrefetchAw);<br class="">
-static usqInt NoDbgRegParms concretizePushCq(AbstractInstruction * self_in_concretizePushCq);<br class="">
+static sqInt NoDbgRegParms concretizePushCq(AbstractInstruction * self_in_concretizePushCq);<br class="">
static usqInt NoDbgRegParms concretizePushCw(AbstractInstruction * self_in_concretizePushCw);<br class="">
static usqInt NoDbgRegParms concretizePushR(AbstractInstruction * self_in_concretizePushR);<br class="">
static usqInt NoDbgRegParms concretizeRetN(AbstractInstruction * self_in_concretizeRetN);<br class="">
@@ -1037,7 +1037,7 @@<br class="">
static sqInt NoDbgRegParms genGetClassIndexOfNonImminto(sqInt sourceReg, sqInt destReg);<br class="">
static sqInt NoDbgRegParms genGetClassObjectOfClassIndexintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg);<br class="">
static sqInt NoDbgRegParms genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver);<br class="">
-static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg);<br class="">
+static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg);<br class="">
static sqInt NoDbgRegParms genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg);<br class="">
static sqInt NoDbgRegParms genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg);<br class="">
static sqInt NoDbgRegParms genGetFormatOfinto(sqInt srcReg, sqInt destReg);<br class="">
@@ -4843,7 +4843,7 @@<br class="">
{<br class="">
sqInt classTag;<br class="">
usqInt classTagPC;<br class="">
- usqInt entryPoint;<br class="">
+ sqInt entryPoint;<br class="">
sqInt errors;<br class="">
sqInt i;<br class="">
usqInt methodObjPC;<br class="">
@@ -5337,13 +5337,18 @@<br class="">
static void (*genEnilopmartForandandforCallcalled(sqInt regArg1, sqInt regArg2OrNone, sqInt regArg3OrNone, sqInt forCall, char *trampolineName))(void)<br class="">
<br class="">
{<br class="">
+ AbstractInstruction *anInstruction;<br class="">
sqInt endAddress;<br class="">
sqInt enilopmart;<br class="">
+ sqInt quickConstant;<br class="">
sqInt size;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+ /* begin MoveCq:R: */<br class="">
+ quickConstant = varBaseAddress();<br class="">
+ /* begin gen:quickConstant:operand: */<br class="">
+ anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
+<br class="">
genLoadStackPointers(backEnd);<br class="">
if (regArg3OrNone != NoReg) {<br class="">
/* begin PopR: */<br class="">
@@ -5433,8 +5438,11 @@<br class="">
AbstractInstruction *anInstruction1;<br class="">
AbstractInstruction *anInstruction2;<br class="">
AbstractInstruction *anInstruction3;<br class="">
+ AbstractInstruction *anInstruction4;<br class="">
sqInt fixupSize;<br class="">
sqInt opcodeSize;<br class="">
+ sqInt quickConstant;<br class="">
+ sqInt quickConstant1;<br class="">
sqInt startAddress;<br class="">
<br class="">
/* begin allocateOpcodes:bytecodes: */<br class="">
@@ -5446,24 +5454,36 @@<br class="">
fixups = ((void *)((((usqInt)abstractOpcodes)) + opcodeSize));<br class="">
zeroOpcodeIndex();<br class="">
labelCounter = 0;<br class="">
+<br class="">
+ /* Must happen first; value may be used in accessing any of the following addresses */<br class="">
startAddress = methodZoneBase;<br class="">
- /* begin maybeSaveVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+ /* begin PushR: */<br class="">
+ genoperand(PushR, VarBaseReg);<br class="">
+ /* begin MoveCq:R: */<br class="">
+ quickConstant1 = varBaseAddress();<br class="">
+ /* begin gen:quickConstant:operand: */<br class="">
+ anInstruction1 = genoperandoperand(MoveCqR, quickConstant1, VarBaseReg);<br class="">
+<br class="">
if (captureFramePointer) {<br class="">
/* begin MoveR:Aw: */<br class="">
address = cFramePointerAddress();<br class="">
/* begin gen:operand:literal: */<br class="">
- anInstruction1 = genoperandoperand(MoveRAw, FPReg, address);<br class="">
+ anInstruction2 = genoperandoperand(MoveRAw, FPReg, address);<br class="">
}<br class="">
+ /* begin MoveR:R: */<br class="">
+ genoperandoperand(MoveRR, SPReg, TempReg);<br class="">
+ /* begin AddCq:R: */<br class="">
+ quickConstant = 0 + BytesPerWord;<br class="">
+ /* begin gen:quickConstant:operand: */<br class="">
+ anInstruction = genoperandoperand(AddCqR, quickConstant, TempReg);<br class="">
/* begin MoveR:Aw: */<br class="">
address1 = cStackPointerAddress();<br class="">
/* begin gen:operand:literal: */<br class="">
- anInstruction2 = genoperandoperand(MoveRAw, SPReg, address1);<br class="">
+ anInstruction3 = genoperandoperand(MoveRAw, TempReg, address1);<br class="">
<br class="">
- /* begin maybeRestoreVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+ /* begin PopR: */<br class="">
+ genoperand(PopR, VarBaseReg);<br class="">
+<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
outputInstructionsForGeneratedRuntimeAt(startAddress);<br class="">
@@ -5686,12 +5706,12 @@<br class="">
generateMapAtstart(sqInt addressOrNull, sqInt startAddress)<br class="">
{<br class="">
unsigned char annotation;<br class="">
- usqInt delta;<br class="">
+ sqInt delta;<br class="">
sqInt i;<br class="">
AbstractInstruction *instruction;<br class="">
sqInt length;<br class="">
- usqInt location;<br class="">
- usqInt mapEntry;<br class="">
+ sqInt location;<br class="">
+ sqInt mapEntry;<br class="">
sqInt maxDelta;<br class="">
usqInt mcpc;<br class="">
<br class="">
@@ -10942,7 +10962,7 @@<br class="">
}<br class="">
<br class="">
/* CogMIPSELCompiler>>#concretizeAddCqR */<br class="">
-static usqInt NoDbgRegParms<br class="">
+static sqInt NoDbgRegParms<br class="">
concretizeAddCqR(AbstractInstruction * self_in_concretizeAddCqR)<br class="">
{<br class="">
sqInt aWord;<br class="">
@@ -11018,7 +11038,7 @@<br class="">
}<br class="">
<br class="">
/* CogMIPSELCompiler>>#concretizeAndCqR */<br class="">
-static usqInt NoDbgRegParms<br class="">
+static sqInt NoDbgRegParms<br class="">
concretizeAndCqR(AbstractInstruction * self_in_concretizeAndCqR)<br class="">
{<br class="">
sqInt aWord;<br class="">
@@ -11596,7 +11616,7 @@<br class="">
the method zone. */<br class="">
<br class="">
/* CogMIPSELCompiler>>#concretizeCall */<br class="">
-static usqInt NoDbgRegParms<br class="">
+static sqInt NoDbgRegParms<br class="">
concretizeCall(AbstractInstruction * self_in_concretizeCall)<br class="">
{<br class="">
return concretizeCallFull(self_in_concretizeCall);<br class="">
@@ -12465,7 +12485,7 @@<br class="">
}<br class="">
<br class="">
/* CogMIPSELCompiler>>#concretizeOrCqR */<br class="">
-static usqInt NoDbgRegParms<br class="">
+static sqInt NoDbgRegParms<br class="">
concretizeOrCqR(AbstractInstruction * self_in_concretizeOrCqR)<br class="">
{<br class="">
sqInt aWord;<br class="">
@@ -12567,7 +12587,7 @@<br class="">
}<br class="">
<br class="">
/* CogMIPSELCompiler>>#concretizePushCq */<br class="">
-static usqInt NoDbgRegParms<br class="">
+static sqInt NoDbgRegParms<br class="">
concretizePushCq(AbstractInstruction * self_in_concretizePushCq)<br class="">
{<br class="">
return concretizePushCw(self_in_concretizePushCq);<br class="">
@@ -15497,6 +15517,7 @@<br class="">
jumpNotSI = genJumpNotSmallInteger(Arg0Reg);<br class="">
genShiftAwaySmallIntegerTagsInScratchReg(ClassReg);<br class="">
genRemoveSmallIntegerTagsInScratchReg(Arg1Reg);<br class="">
+ /* begin MulR:R: */<br class="">
genMulRR(backEnd, Arg1Reg, ClassReg);<br class="">
/* begin JumpOverflow: */<br class="">
jumpOvfl = genConditionalBranchoperand(JumpOverflow, ((sqInt)0));<br class="">
@@ -18353,7 +18374,7 @@<br class="">
}<br class="">
<br class="">
/* CogObjectRepresentationForSpur>>#genGetClassTagOf:into:scratchReg: */<br class="">
-static sqInt NoDbgRegParms<br class="">
+static AbstractInstruction * NoDbgRegParms<br class="">
genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg)<br class="">
{<br class="">
return genGetInlineCacheClassTagFromintoforEntry(instReg, destReg, 1);<br class="">
@@ -21024,6 +21045,7 @@<br class="">
AbstractInstruction *anInstruction15;<br class="">
AbstractInstruction *anInstruction16;<br class="">
AbstractInstruction *anInstruction17;<br class="">
+ AbstractInstruction *anInstruction18;<br class="">
AbstractInstruction *anInstruction2;<br class="">
AbstractInstruction *anInstruction3;<br class="">
AbstractInstruction *anInstruction4;<br class="">
@@ -21037,11 +21059,15 @@<br class="">
AbstractInstruction * inst;<br class="">
AbstractInstruction *jmpFail;<br class="">
AbstractInstruction *jmpSample;<br class="">
+ sqInt quickConstant;<br class="">
sqInt reg;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+ /* begin MoveCq:R: */<br class="">
+ quickConstant = varBaseAddress();<br class="">
+ /* begin gen:quickConstant:operand: */<br class="">
+ anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
+<br class="">
if (profiling) {<br class="">
<br class="">
/* Test nextProfileTick for being non-zero and call checkProfileTick: if so.<br class="">
@@ -21049,11 +21075,11 @@<br class="">
/* begin MoveAw:R: */<br class="">
address = nextProfileTickAddress();<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction = genoperandoperand(MoveAwR, address, TempReg);<br class="">
+ anInstruction1 = genoperandoperand(MoveAwR, address, TempReg);<br class="">
/* begin MoveAw:R: */<br class="">
address1 = (nextProfileTickAddress()) + BytesPerWord;<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction1 = genoperandoperand(MoveAwR, address1, ClassReg);<br class="">
+ anInstruction2 = genoperandoperand(MoveAwR, address1, ClassReg);<br class="">
/* begin OrR:R: */<br class="">
genoperandoperand(OrRR, TempReg, ClassReg);<br class="">
<br class="">
@@ -21066,19 +21092,19 @@<br class="">
/* begin MoveAw:R: */<br class="">
address6 = primFailCodeAddress();<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction12 = genoperandoperand(MoveAwR, address6, TempReg);<br class="">
+ anInstruction13 = genoperandoperand(MoveAwR, address6, TempReg);<br class="">
flag("ask concrete code gen if move sets condition codes?");<br class="">
/* begin CmpCq:R: */<br class="">
- anInstruction13 = genoperandoperand(CmpCqR, 0, TempReg);<br class="">
+ anInstruction14 = genoperandoperand(CmpCqR, 0, TempReg);<br class="">
/* begin JumpNonZero: */<br class="">
jmpFail = genConditionalBranchoperand(JumpNonZero, ((sqInt)0));<br class="">
genLoadStackPointers(backEnd);<br class="">
/* begin MoveMw:r:R: */<br class="">
- anInstruction5 = genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg);<br class="">
+ anInstruction6 = genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg);<br class="">
/* begin MoveAw:R: */<br class="">
address4 = instructionPointerAddress();<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction6 = genoperandoperand(MoveAwR, address4, LinkReg);<br class="">
+ anInstruction7 = genoperandoperand(MoveAwR, address4, LinkReg);<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, BytesPerWord);<br class="">
<br class="">
@@ -21087,16 +21113,16 @@<br class="">
/* begin MoveAw:R: */<br class="">
address7 = cStackPointerAddress();<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction14 = genoperandoperand(MoveAwR, address7, SPReg);<br class="">
+ anInstruction15 = genoperandoperand(MoveAwR, address7, SPReg);<br class="">
compileCallFornumArgsargargargargresultRegsaveRegs(ceActivateFailingPrimitiveMethod, 1, SendNumArgsReg, null, null, null, NoReg, 0);<br class="">
/* begin MoveAw:R: */<br class="">
address8 = instructionPointerAddress();<br class="">
reg = LinkReg;<br class="">
/* begin gen:literal:operand: */<br class="">
- anInstruction15 = genoperandoperand(MoveAwR, address8, reg);<br class="">
+ anInstruction16 = genoperandoperand(MoveAwR, address8, reg);<br class="">
genLoadStackPointers(backEnd);<br class="">
/* begin MoveMw:r:R: */<br class="">
- anInstruction10 = genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg);<br class="">
+ anInstruction11 = genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg);<br class="">
<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, BytesPerWord);<br class="">
@@ -21110,7 +21136,7 @@<br class="">
/* begin CallFullRT: */<br class="">
callTarget = (unsigned long)ceCheckProfileTick;<br class="">
/* begin CallFull: */<br class="">
- anInstruction16 = genoperand(CallFull, callTarget);<br class="">
+ anInstruction17 = genoperand(CallFull, callTarget);<br class="">
<br class="">
<br class="">
/* begin PopR: */<br class="">
@@ -22985,14 +23011,19 @@<br class="">
static void (*genCallPICEnilopmartNumArgs(sqInt numArgs))(void)<br class="">
<br class="">
{<br class="">
+ AbstractInstruction *anInstruction;<br class="">
sqInt endAddress;<br class="">
sqInt enilopmart;<br class="">
+ sqInt quickConstant;<br class="">
sqInt reg;<br class="">
sqInt size;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+ /* begin MoveCq:R: */<br class="">
+ quickConstant = varBaseAddress();<br class="">
+ /* begin gen:quickConstant:operand: */<br class="">
+ anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
+<br class="">
genLoadStackPointers(backEnd);<br class="">
/* begin PopR: */<br class="">
genoperand(PopR, ClassReg);<br class="">
<br class="">
Modified: branches/Cog/platforms/Cross/vm/sqCogStackAlignment.h<br class="">
===================================================================<br class="">
--- branches/Cog/platforms/Cross/vm/sqCogStackAlignment.h 2016-01-10 21:49:21 UTC (rev 3552)<br class="">
+++ branches/Cog/platforms/Cross/vm/sqCogStackAlignment.h 2016-01-10 22:51:42 UTC (rev 3553)<br class="">
@@ -37,8 +37,22 @@<br class="">
* __m256 is passed on stack) byte boundary. In other words, the value<br class="">
* (%rsp + 8) is always a multiple of 16 (32) when control is transferred to<br class="">
* the function entry point.<br class="">
+ * However,<br class="">
+ * <a href="https://developer.apple.com/library/mac/documentation/DeveloperTools/" rel="noreferrer" target="_blank" class="">https://developer.apple.com/library/mac/documentation/DeveloperTools/</a><br class="">
+ * Conceptual/LowLevelABI/140-x86-64_Function_Calling_Conventions/x86_64.html<br class="">
+ * claims<br class="">
+ * "The OS X x86-64 function calling conventions are the same as the function<br class="">
+ * calling conventions described in System V Application Binary Interface AMD64<br class="">
+ * Architecture Processor Supplement, found at<br class="">
+ * <a href="http://people.freebsd.org/~obrien/amd64-elf-abi.pdf" rel="noreferrer" target="_blank" class="">http://people.freebsd.org/~obrien/amd64-elf-abi.pdf</a>. See that document for<br class="">
+ * details."<br class="">
+ * and that document states:<br class="">
+ * "The end of the input argument area shall be aligned on a 16 byte boundary.<br class="">
+ * In other words, the value (%rsp ? 8) is always a multiple of 16 when control<br class="">
+ * is transferred to the function entry point. The stack pointer, %rsp, always<br class="">
+ * points to the end of the latest allocated stack frame."<br class="">
*/<br class="">
-# if __APPLE__ && __MACH__ /* i.e. the __m256 regime */<br class="">
+# if __APPLE__ && __MACH__ && 0/* i.e. the __m256 regime */<br class="">
# define STACK_ALIGN_BYTES 32<br class="">
# define STACK_FP_ALIGNMENT 16 /* aligned sp - retpc - saved fp */<br class="">
# else<br class="">
<br class="">
<br class="">
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h<br class="">
___________________________________________________________________<br class="">
Modified: checkindate<br class="">
- Sun Jan 10 13:47:59 PST 2016<br class="">
+ Sun Jan 10 14:48:56 PST 2016<br class="">
<br class="">
Modified: branches/Cog/spur64src/vm/cogit.h<br class="">
===================================================================<br class="">
--- branches/Cog/spur64src/vm/cogit.h 2016-01-10 21:49:21 UTC (rev 3552)<br class="">
+++ branches/Cog/spur64src/vm/cogit.h 2016-01-10 22:51:42 UTC (rev 3553)<br class="">
@@ -1,5 +1,5 @@<br class="">
/* Automatically generated by<br class="">
- CCodeGenerator VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ CCodeGenerator VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
*/<br class="">
<br class="">
<br class="">
<br class="">
Modified: branches/Cog/spur64src/vm/cogitX64.c<br class="">
===================================================================<br class="">
--- branches/Cog/spur64src/vm/cogitX64.c 2016-01-10 21:49:21 UTC (rev 3552)<br class="">
+++ branches/Cog/spur64src/vm/cogitX64.c 2016-01-10 22:51:42 UTC (rev 3553)<br class="">
@@ -1,9 +1,9 @@<br class="">
/* Automatically generated by<br class="">
- CCodeGenerator VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ CCodeGenerator VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
from<br class="">
- StackToRegisterMappingCogit VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7<br class="">
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab<br class="">
*/<br class="">
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1629 uuid: e706b773-41e5-482b-aa41-bacdf83d47e7 " __DATE__ ;<br class="">
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1630 uuid: 2ed025ea-f400-4440-8e8b-5aa46d06c9ab " __DATE__ ;<br class="">
char *__cogitBuildInfo = __buildInfo;<br class="">
<br class="">
<br class="">
@@ -782,7 +782,7 @@<br class="">
static sqInt NoDbgRegParms genGetClassIndexOfNonImminto(sqInt sourceReg, sqInt destReg);<br class="">
static sqInt NoDbgRegParms genGetClassObjectOfClassIndexintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg);<br class="">
static sqInt NoDbgRegParms genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver);<br class="">
-static sqInt NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg);<br class="">
+static AbstractInstruction * NoDbgRegParms genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg);<br class="">
static sqInt NoDbgRegParms genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg);<br class="">
static sqInt NoDbgRegParms genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg);<br class="">
static sqInt NoDbgRegParms genGetFormatOfinto(sqInt srcReg, sqInt destReg);<br class="">
@@ -912,6 +912,7 @@<br class="">
static sqInt genLongUnconditionalForwardJump(void);<br class="">
static sqInt NoDbgRegParms genLookupForPerformNumArgs(sqInt numArgs);<br class="">
static AbstractInstruction * NoDbgRegParms genMoveConstantR(sqInt constant, sqInt reg);<br class="">
+static AbstractInstruction * NoDbgRegParms genMoveFalseR(sqInt reg);<br class="">
static sqInt NoDbgRegParms genMoveTrueR(sqInt reg);<br class="">
static sqInt NoDbgRegParms genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName);<br class="">
static void NoDbgRegParms genPrimReturnEnterCogCodeEnilopmart(sqInt profiling);<br class="">
@@ -5016,11 +5017,11 @@<br class="">
sqInt size;<br class="">
<br class="">
zeroOpcodeIndex();<br class="">
- /* begin maybeEstablishVarBase */<br class="">
+ /* begin MoveCq:R: */<br class="">
quickConstant = varBaseAddress();<br class="">
/* begin gen:quickConstant:operand: */<br class="">
anInstruction = genoperandoperand(MoveCqR, quickConstant, VarBaseReg);<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+<br class="">
genLoadStackPointers(backEnd);<br class="">
if (regArg3OrNone != NoReg) {<br class="">
/* begin PopR: */<br class="">
@@ -5113,35 +5114,36 @@<br class="">
fixups = ((void *)((((usqInt)abstractOpcodes)) + opcodeSize));<br class="">
zeroOpcodeIndex();<br class="">
labelCounter = 0;<br class="">
+<br class="">
+ /* Must happen first; value may be used in accessing any of the following addresses */<br class="">
startAddress = methodZoneBase;<br class="">
- /* begin maybeSaveVarBase */<br class="">
+ /* begin PushR: */<br class="">
genoperand(PushR, VarBaseReg);<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
- /* begin maybeEstablishVarBase */<br class="">
+ /* begin MoveCq:R: */<br class="">
quickConstant1 = varBaseAddress();<br class="">
/* begin gen:quickConstant:operand: */<br class="">
- anInstruction4 = genoperandoperand(MoveCqR, quickConstant1, VarBaseReg);<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+ anInstruction1 = genoperandoperand(MoveCqR, quickConstant1, VarBaseReg);<br class="">
+<br class="">
if (captureFramePointer) {<br class="">
/* begin MoveR:Aw: */<br class="">
address = cFramePointerAddress();<br class="">
/* begin gen:operand:literal: */<br class="">
- anInstruction1 = genoperandoperand(MoveRAw, FPReg, address);<br class="">
+ anInstruction2 = genoperandoperand(MoveRAw, FPReg, address);<br class="">
}<br class="">
/* begin MoveR:R: */<br class="">
genoperandoperand(MoveRR, SPReg, TempReg);<br class="">
/* begin AddCq:R: */<br class="">
- quickConstant = leafCallStackPointerDelta(backEnd);<br class="">
+ quickConstant = (leafCallStackPointerDelta(backEnd)) + BytesPerWord;<br class="">
/* begin gen:quickConstant:operand: */<br class="">
anInstruction = genoperandoperand(AddCqR, quickConstant, TempReg);<br class="">
/* begin MoveR:Aw: */<br class="">
- address2 = cStackPointerAddress();<br class="">
+ address1 = cStackPointerAddress();<br class="">
/* begin gen:operand:literal: */<br class="">
- anInstruction3 = genoperandoperand(MoveRAw, TempReg, address2);<br class="">
+ anInstruction3 = genoperandoperand(MoveRAw, TempReg, address1);<br class="">
<br class="">
- /* begin maybeRestoreVarBase */<br class="">
+ /* begin PopR: */<br class="">
genoperand(PopR, VarBaseReg);<br class="">
- ((AbstractInstruction *) backEnd);<br class="">
+<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
outputInstructionsForGeneratedRuntimeAt(startAddress);<br class="">
@@ -6047,6 +6049,8 @@<br class="">
((methodLabel->operands))[0] = 0;<br class="">
((methodLabel->operands))[1] = 0;<br class="">
callerSavedRegMask = callerSavedRegisterMask(backEnd);<br class="">
+ assert(((registerMaskFor(VarBaseReg)) & callerSavedRegMask) == 0);<br class="">
+<br class="">
/* begin allocateLiterals: */<br class="">
}<br class="">
<br class="">
@@ -9779,7 +9783,7 @@<br class="">
<br class="">
/* FP jumps are a little weird */<br class="">
jumpCond = jumpOpcodeGenerator(0);<br class="">
- /* begin genMoveConstant:R: */<br class="">
+ /* begin genMoveFalseR: */<br class="">
constant = falseObject();<br class="">
if (shouldAnnotateObjectReference(constant)) {<br class="">
annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant);<br class="">
@@ -10657,7 +10661,7 @@<br class="">
/* begin CmpR:R: */<br class="">
genoperandoperand(CmpRR, Arg0Reg, ReceiverResultReg);<br class="">
jumpTrue = genConditionalBranchoperand(jumpOpcode, 0);<br class="">
- /* begin genMoveConstant:R: */<br class="">
+ /* begin genMoveFalseR: */<br class="">
constant = falseObject();<br class="">
if (shouldAnnotateObjectReference(constant)) {<br class="">
annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant);<br class="">
@@ -10725,7 +10729,7 @@<br class="">
<br class="">
/* FP jumps are a little weird */<br class="">
jumpCond = jumpFPOpcodeGenerator(0);<br class="">
- /* begin genMoveConstant:R: */<br class="">
+ /* begin genMoveFalseR: */<br class="">
constant = falseObject();<br class="">
if (shouldAnnotateObjectReference(constant)) {<br class="">
annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant);<br class="">
@@ -12094,7 +12098,7 @@<br class="">
<br class="">
/* FP jumps are a little weird */<br class="">
jumpCond = jumpOpcodeGenerator(0);<br class="">
- /* begin genMoveConstant:R: */<br class="">
+ /* begin genMoveFalseR: */<br class="">
constant = falseObject();<br class="">
if (shouldAnnotateObjectReference(constant)) {<br class="">
annotateobjRef(gMoveCwR(constant, ReceiverResultReg), constant);<br class="">
@@ -12950,7 +12954,7 @@<br class="">
}<br class="">
<br class="">
/* CogObjectRepresentationForSpur>>#genGetClassTagOf:into:scratchReg: */<br class="">
-static sqInt NoDbgRegParms<br class="">
+static AbstractInstruction * NoDbgRegParms<br class="">
genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg)<br class="">
{<br class="">
return genGetInlineCacheClassTagFromintoforEntry(instReg, destReg, 1);<br class="">
@@ -13332,7 +13336,7 @@<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
genoperand(RetN, 0);<br class="">
- jmpTarget(jumpCmp, genMoveConstantR(falseObject(), ReceiverResultReg));<br class="">
+ jmpTarget(jumpCmp, genMoveFalseR(ReceiverResultReg));<br class="">
/* begin genPrimReturn */<br class="">
assert(methodOrBlockNumArgs <= (numRegArgs()));<br class="">
/* begin RetN: */<br class="">
<br class="">
@@ Diff output truncated at 50000 characters. @@<br class="">
</blockquote></div><br class=""><br clear="all" class=""><div class=""><br class=""></div>-- <br class=""><div class="gmail_signature"><div dir="ltr" class=""><div class=""><span style="font-size:small;border-collapse:separate" class=""><div class="">_,,,^..^,,,_<br class=""></div><div class="">best, Eliot</div></span></div></div></div>
</div></div>
</div></blockquote></div><br class=""></div></body></html>