[Vm-dev] [commit][3369] CogVM source as per VMMaker.oscog-eem.1337
commits at squeakvm.org
commits at squeakvm.org
Thu Jun 4 05:47:15 UTC 2015
Revision: 3369
Author: eliot
Date: 2015-06-03 22:47:13 -0700 (Wed, 03 Jun 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1337
Fix defaultCogCodeSize to avoid exporting AbstractInstruction through cogit.h.
Modified Paths:
--------------
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cogitARMv5.c
branches/Cog/nsspursrc/vm/cogitIA32.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cogitARMv5.c
branches/Cog/spursistasrc/vm/cogitIA32.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cogitARMv5.c
branches/Cog/spursrc/vm/cogitIA32.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cogitARMv5.c
branches/Cog/src/vm/cogitIA32.c
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
@@ -20,7 +20,6 @@
# define NeverInline /*empty*/
#endif
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
@@ -39,6 +38,7 @@
CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
+sqInt defaultCogCodeSize(void);
void enterCogCodePopReceiver(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void followForwardedLiteralsIn(CogMethod *cogMethod);
Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -450,7 +450,6 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -617,6 +616,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt extABytecode(void);
@@ -2959,18 +2959,6 @@
}
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogARMCompiler>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1400;
-}
-
-
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -9926,7 +9914,7 @@
{
sqInt classIndex;
sqInt i;
- usqInt pc;
+ sqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd));
for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) {
@@ -9999,6 +9987,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1400;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/nsspursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -394,7 +394,6 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -561,6 +560,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt extABytecode(void);
@@ -1966,18 +1966,6 @@
return null;
}
-
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogAbstractInstruction>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1024;
-}
-
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -8772,6 +8760,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1024;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Jun 3 22:15:54 PDT 2015
+ Wed Jun 3 22:45:36 PDT 2015
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
@@ -20,7 +20,6 @@
# define NeverInline /*empty*/
#endif
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
@@ -39,6 +38,7 @@
CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
+sqInt defaultCogCodeSize(void);
void enterCogCodePopReceiver(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void followForwardedLiteralsIn(CogMethod *cogMethod);
Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -448,7 +448,6 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -616,6 +615,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt extABytecode(void);
@@ -2963,18 +2963,6 @@
}
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogARMCompiler>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1400;
-}
-
-
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -9839,7 +9827,7 @@
{
sqInt classIndex;
sqInt i;
- usqInt pc;
+ sqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd));
for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) {
@@ -9912,6 +9900,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1400;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/spursistasrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -392,7 +392,6 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -559,6 +558,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt extABytecode(void);
@@ -1969,18 +1969,6 @@
return null;
}
-
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogAbstractInstruction>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1024;
-}
-
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -8673,6 +8661,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1024;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursrc/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
@@ -20,7 +20,6 @@
# define NeverInline /*empty*/
#endif
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
@@ -39,6 +38,7 @@
CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
+sqInt defaultCogCodeSize(void);
void enterCogCodePopReceiver(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void followForwardedLiteralsIn(CogMethod *cogMethod);
Modified: branches/Cog/spursrc/vm/cogitARMv5.c
===================================================================
--- branches/Cog/spursrc/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursrc/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -445,7 +445,6 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -611,6 +610,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -2635,18 +2635,6 @@
}
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogARMCompiler>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1400;
-}
-
-
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -9463,7 +9451,7 @@
{
sqInt classIndex;
sqInt i;
- sqInt pc;
+ usqInt pc;
pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd));
for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) {
@@ -9536,6 +9524,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1400;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/spursrc/vm/cogitIA32.c
===================================================================
--- branches/Cog/spursrc/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/spursrc/vm/cogitIA32.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -389,7 +389,6 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -554,6 +553,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -1641,18 +1641,6 @@
return null;
}
-
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogAbstractInstruction>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1024;
-}
-
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -8297,6 +8285,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1024;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/src/vm/cogit.h
===================================================================
--- branches/Cog/src/vm/cogit.h 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/src/vm/cogit.h 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
@@ -20,7 +20,6 @@
# define NeverInline /*empty*/
#endif
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
sqInt abortOffset(void);
void addCogMethodsToHeapMap(void);
sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod);
@@ -39,6 +38,7 @@
CogMethod * cogMNUPICSelectorreceivermethodOperandnumArgs(sqInt selector, sqInt rcvr, sqInt methodOperand, sqInt numArgs);
CogMethod * cogselector(sqInt aMethodObj, sqInt aSelectorOop);
void compactCogCompiledCode(void);
+sqInt defaultCogCodeSize(void);
void enterCogCodePopReceiver(void);
CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod);
void initializeCodeZoneFromupTo(sqInt startAddress, sqInt endAddress);
Modified: branches/Cog/src/vm/cogitARMv5.c
===================================================================
--- branches/Cog/src/vm/cogitARMv5.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/src/vm/cogitARMv5.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -450,7 +450,6 @@
static AbstractInstruction * concretizeSubRdRd(AbstractInstruction * self_in_concretizeSubRdRd) NoDbgRegParms;
static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms;
static sqInt dataOpTyperdrnrmlsr(AbstractInstruction * self_in_dataOpTyperdrnrmlsr, sqInt armOpcode, sqInt destReg, sqInt srcReg, sqInt addReg, sqInt shft) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms;
static sqInt extract32BitOperandFrom4InstructionsPreceeding(AbstractInstruction * self_in_extract32BitOperandFrom4InstructionsPreceeding, sqInt addr) NoDbgRegParms;
static sqInt fullCallsAreRelative(AbstractInstruction * self_in_fullCallsAreRelative) NoDbgRegParms;
@@ -615,6 +614,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -2598,18 +2598,6 @@
}
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogARMCompiler>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1400;
-}
-
-
/* Attempt to generate concrete machine code for the instruction at address.
This is the inner dispatch of concretizeAt: actualAddress which exists
only to get around the branch size limits in the SqueakV3 (blue book
@@ -9501,6 +9489,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1400;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
Modified: branches/Cog/src/vm/cogitIA32.c
===================================================================
--- branches/Cog/src/vm/cogitIA32.c 2015-06-04 05:19:31 UTC (rev 3368)
+++ branches/Cog/src/vm/cogitIA32.c 2015-06-04 05:47:13 UTC (rev 3369)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ CCodeGenerator VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
from
- StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a
+ StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182
*/
-static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1336 uuid: a8254ed3-d450-4a8a-aa78-7ae88f6aae1a " __DATE__ ;
+static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1337 uuid: bbb568f4-b2c8-4711-9d7a-7ad42d103182 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;
@@ -393,7 +393,6 @@
static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms;
static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms;
static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms;
-sqInt defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize);
static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms;
static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush) NoDbgRegParms;
static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms;
@@ -557,6 +556,7 @@
static sqInt cPICHasFreedTargets(CogMethod *cPIC) NoDbgRegParms;
static sqInt cPICHasTarget(CogMethod *cPIC, CogMethod *targetMethod) NoDbgRegParms;
static AbstractInstruction * gDivRRQuoRem(sqInt rDivisor, sqInt rDividend, sqInt rQuotient, sqInt rRemainder) NoDbgRegParms;
+sqInt defaultCogCodeSize(void);
static sqInt endPCOf(sqInt aMethod) NoDbgRegParms;
void enterCogCodePopReceiver(void);
static sqInt fillInBlockHeadersAt(sqInt startAddress) NoDbgRegParms;
@@ -1603,18 +1603,6 @@
return null;
}
-
-/* Return the default number of bytes to allocate for native code at startup.
- The actual value can be set via vmParameterAt: and/or a preference in the
- ini file. */
-
- /* CogAbstractInstruction>>#defaultCogCodeSize */
-sqInt
-defaultCogCodeSize(AbstractInstruction * self_in_defaultCogCodeSize)
-{
- return 1024 * 1024;
-}
-
/* CogAbstractInstruction>>#genAlignCStackSavingRegisters:numArgs:wordAlignment: */
static sqInt
genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment)
@@ -8261,6 +8249,18 @@
return abstractInstructionAt(opcodeIndex - 1);
}
+
+/* Return the default number of bytes to allocate for native code at startup.
+ The actual value can be set via vmParameterAt: and/or a preference in the
+ ini file. */
+
+ /* Cogit>>#defaultCogCodeSize */
+sqInt
+defaultCogCodeSize(void)
+{
+ return 1024 * 1024;
+}
+
/* Cogit>>#endPCOf: */
static sqInt
endPCOf(sqInt aMethod)
More information about the Vm-dev
mailing list