Skip to content

Commit

Permalink
Regenerate sources with VMMaker.oscogLLP64-nice.1920
Browse files Browse the repository at this point in the history 
Version 1919 incorrectly use PRIxPTR instead of PRIxSQPTR.
The first macro is available in C99 but not included in interp.h.

Notice the unwanted sqInt <-> usqInt changes
Code generation is not fully reproducible.
This is due to type inferencer/inliner which don't allways follow the same path
(probably due to unordered method dictionaries)
  • Loading branch information
@nicolas-cellier-aka-nice
nicolas-cellier-aka-nice committed Aug 7, 2016
1 parent 3193312 commit ff88ad7
Show file tree
Hide file tree
Showing 81 changed files with 385 additions and 385 deletions.
2 changes: 1 addition & 1 deletion nsspur64src/vm/cogit.h
View file
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/


Expand Down
6 changes: 3 additions & 3 deletions nsspur64src/vm/cogitX64.c
View file
@@ -1,9 +1,9 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
from
StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ;
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;


Expand Down
2 changes: 1 addition & 1 deletion nsspur64src/vm/cogmethod.h
View file
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/

typedef struct {
Expand Down
28 changes: 14 additions & 14 deletions nsspur64src/vm/cointerp.c
View file
@@ -1,9 +1,9 @@
/* Automatically generated by
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
from
CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/
static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ;
static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;


Expand Down Expand Up @@ -2456,7 +2456,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */]
};
sqInt checkedPluginName;
char expensiveAsserts = 0;
const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919";
const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;

Expand Down Expand Up @@ -17723,7 +17723,7 @@ checkStackIntegrity(void)
sqInt i;
sqInt methodField;
sqInt ok;
sqInt oop;
usqInt oop;
char *theFP;
StackPage *thePage;
char *theSP;
Expand Down Expand Up @@ -23811,7 +23811,7 @@ printFrameWithSP(char *theFP, char *theSP)
usqInt index;
sqInt methodField;
usqInt numArgs;
usqInt numTemps;
sqInt numTemps;
char *rcvrAddress;
sqInt rcvrOrClosure;
sqInt theMethod;
Expand Down Expand Up @@ -34812,7 +34812,7 @@ primitiveImmediateAsInteger(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt oop;
char *sp;
sqInt value;
usqInt value;

value = 0;
oop = longAt(GIV(stackPointer));
Expand Down Expand Up @@ -42822,7 +42822,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass)
sqInt fmt;
usqInt instBytes;
sqInt instFormat;
sqInt newFormat;
usqInt newFormat;
sqInt normalizedInstFormat;
usqInt numBytes;
usqInt numSlots;
Expand Down Expand Up @@ -42991,7 +42991,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass)
/* begin set:classIndexTo:formatTo: */
assert(((classIndex >= 0) && (classIndex <= (classIndexMask()))));
assert(((newFormat >= 0) && (newFormat <= (formatMask()))));
longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift()))))));
longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift()))));
return 0;
}

Expand Down Expand Up @@ -49993,7 +49993,7 @@ eliminateAndFreeForwardersForPigCompact(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt address;
sqInt address1;
usqInt bytes;
sqInt bytes;
sqInt endOfFreeRun;
sqInt f;
sqInt firstOfFreeRun;
Expand Down Expand Up @@ -61694,7 +61694,7 @@ maybeSplObj(sqInt index)
static sqInt NoDbgRegParms
moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt chunkBytes;
usqInt chunkBytes;
sqInt classIndex;
sqInt classIndex1;
sqInt dest;
Expand Down Expand Up @@ -67539,7 +67539,7 @@ static void NoDbgRegParms
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
usqInt clifton;
sqInt clifton;
usqInt segEnd;

segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
Expand Down Expand Up @@ -68126,8 +68126,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
sqInt pier1;
sqInt pier2;
usqInt pier1;
usqInt pier2;
usqLong secondSavedBridgeWord;

pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Expand Down
2 changes: 1 addition & 1 deletion nsspur64src/vm/cointerp.h
View file
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/


Expand Down
28 changes: 14 additions & 14 deletions nsspur64src/vm/gcc3x-cointerp.c
View file
Expand Up @@ -2,11 +2,11 @@


/* Automatically generated by
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
from
CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/
static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ;
static char __buildInfo[] = "CoInterpreter VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;


Expand Down Expand Up @@ -2459,7 +2459,7 @@ static signed char primitiveAccessorDepthTable[MaxPrimitiveIndex + 2 /* 577 */]
};
sqInt checkedPluginName;
char expensiveAsserts = 0;
const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1919";
const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscogLLP64-nice.1920";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;

Expand Down Expand Up @@ -17732,7 +17732,7 @@ checkStackIntegrity(void)
sqInt i;
sqInt methodField;
sqInt ok;
sqInt oop;
usqInt oop;
char *theFP;
StackPage *thePage;
char *theSP;
Expand Down Expand Up @@ -23820,7 +23820,7 @@ printFrameWithSP(char *theFP, char *theSP)
usqInt index;
sqInt methodField;
usqInt numArgs;
usqInt numTemps;
sqInt numTemps;
char *rcvrAddress;
sqInt rcvrOrClosure;
sqInt theMethod;
Expand Down Expand Up @@ -34821,7 +34821,7 @@ primitiveImmediateAsInteger(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt oop;
char *sp;
sqInt value;
usqInt value;

value = 0;
oop = longAt(GIV(stackPointer));
Expand Down Expand Up @@ -42831,7 +42831,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass)
sqInt fmt;
usqInt instBytes;
sqInt instFormat;
sqInt newFormat;
usqInt newFormat;
sqInt normalizedInstFormat;
usqInt numBytes;
usqInt numSlots;
Expand Down Expand Up @@ -43000,7 +43000,7 @@ changeClassOfto(sqInt rcvr, sqInt argClass)
/* begin set:classIndexTo:formatTo: */
assert(((classIndex >= 0) && (classIndex <= (classIndexMask()))));
assert(((newFormat >= 0) && (newFormat <= (formatMask()))));
longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (((sqInt)((usqInt)(newFormat) << (formatShift()))))));
longAtput(rcvr, ((longAt(rcvr)) & (~((((sqInt)((usqInt)((formatMask())) << (formatShift())))) + (classIndexMask())))) + (classIndex + (newFormat << (formatShift()))));
return 0;
}

Expand Down Expand Up @@ -50002,7 +50002,7 @@ eliminateAndFreeForwardersForPigCompact(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt address;
sqInt address1;
usqInt bytes;
sqInt bytes;
sqInt endOfFreeRun;
sqInt f;
sqInt firstOfFreeRun;
Expand Down Expand Up @@ -61703,7 +61703,7 @@ maybeSplObj(sqInt index)
static sqInt NoDbgRegParms
moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt chunkBytes;
usqInt chunkBytes;
sqInt classIndex;
sqInt classIndex1;
sqInt dest;
Expand Down Expand Up @@ -67548,7 +67548,7 @@ static void NoDbgRegParms
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
usqInt clifton;
sqInt clifton;
usqInt segEnd;

segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
Expand Down Expand Up @@ -68135,8 +68135,8 @@ writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSeg
{
usqLong firstSavedBridgeWord;
sqInt nWritten;
sqInt pier1;
sqInt pier2;
usqInt pier1;
usqInt pier2;
usqLong secondSavedBridgeWord;

pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Expand Down
2 changes: 1 addition & 1 deletion nsspur64src/vm/interp.h
View file
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/

#define VM_PROXY_MAJOR 1
Expand Down
2 changes: 1 addition & 1 deletion nsspur64src/vm/nssendcache.h
View file
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/

typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion nsspur64src/vm/vmCallback.h
View file
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGeneratorGlobalStructure VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/

#define VM_CALLBACK_INC 1
Expand Down
2 changes: 1 addition & 1 deletion nsspursrc/vm/cogit.h
View file
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/


Expand Down
18 changes: 9 additions & 9 deletions nsspursrc/vm/cogitARMv5.c
View file
@@ -1,9 +1,9 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
from
StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ;
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;


Expand Down Expand Up @@ -709,7 +709,7 @@ static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt re
static AbstractInstruction * NoDbgRegParms gMoveMwrR(sqInt offset, sqInt baseReg, sqInt destReg);
static AbstractInstruction * NoDbgRegParms gMoveRMwr(sqInt sourceReg, sqInt offset, sqInt baseReg);
static AbstractInstruction * NoDbgRegParms gMoveRR(sqInt reg1, sqInt reg2);
static sqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
static usqInt NoDbgRegParms mapEndFor(CogMethod *cogMethod);
static sqInt NoDbgRegParms mapForperformUntilarg(CogMethod *cogMethod, sqInt (*functionSymbol)(sqInt annotation, char *mcpc, sqInt arg), sqInt arg);
static sqInt NoDbgRegParms mapObjectReferencesInClosedPIC(CogMethod *cPIC);
static void mapObjectReferencesInGeneratedRuntime(void);
Expand Down Expand Up @@ -7517,7 +7517,7 @@ static sqInt NoDbgRegParms
blockDispatchTargetsForperformarg(CogMethod *cogMethod, usqInt (*binaryFunction)(sqInt mcpc, sqInt arg), sqInt arg)
{
sqInt blockEntry;
sqInt end;
usqInt end;
sqInt pc;
sqInt result;
usqInt targetpc;
Expand Down Expand Up @@ -7561,7 +7561,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod)
sqInt byte;
BytecodeDescriptor *descriptor;
sqInt distance;
sqInt endbcpc;
usqInt endbcpc;
CogMethod *homeMethod;
sqInt isBackwardBranch;
sqInt isInBlock;
Expand Down Expand Up @@ -12044,7 +12044,7 @@ gMoveRR(sqInt reg1, sqInt reg2)
/* Answer the address of the null byte at the end of the method map. */

/* Cogit>>#mapEndFor: */
static sqInt NoDbgRegParms
static usqInt NoDbgRegParms
mapEndFor(CogMethod *cogMethod)
{
usqInt end;
Expand Down Expand Up @@ -13104,7 +13104,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co
sqInt byte;
BytecodeDescriptor *descriptor;
sqInt distance;
sqInt endbcpc;
usqInt endbcpc;
CogMethod *homeMethod;
sqInt isBackwardBranch;
sqInt isInBlock;
Expand Down Expand Up @@ -24992,7 +24992,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj)
CogBlockMethod *cogMethod1;
BytecodeDescriptor *descriptor;
sqInt distance;
sqInt endbcpc;
usqInt endbcpc;
sqInt errCode;
CogMethod *homeMethod;
sqInt isBackwardBranch;
Expand Down
12 changes: 6 additions & 6 deletions nsspursrc/vm/cogitIA32.c
View file
@@ -1,9 +1,9 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
CCodeGenerator VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
from
StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c
StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2
*/
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1919 uuid: 67128742-82db-1c4a-a5e7-f1f7a5cee80c " __DATE__ ;
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscogLLP64-nice.1920 uuid: c1c7e816-a15c-6a4d-b25d-7cc5ef4f0cb2 " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;


Expand Down Expand Up @@ -6679,7 +6679,7 @@ bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod)
sqInt byte;
BytecodeDescriptor *descriptor;
sqInt distance;
usqInt endbcpc;
sqInt endbcpc;
CogMethod *homeMethod;
sqInt isBackwardBranch;
sqInt isInBlock;
Expand Down Expand Up @@ -12065,7 +12065,7 @@ mcPCForBackwardBranchstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *co
sqInt byte;
BytecodeDescriptor *descriptor;
sqInt distance;
usqInt endbcpc;
sqInt endbcpc;
CogMethod *homeMethod;
sqInt isBackwardBranch;
sqInt isInBlock;
Expand Down Expand Up @@ -22174,7 +22174,7 @@ mapPCDataForinto(CogMethod *cogMethod, sqInt arrayObj)
CogBlockMethod *cogMethod1;
BytecodeDescriptor *descriptor;
sqInt distance;
usqInt endbcpc;
sqInt endbcpc;
sqInt errCode;
CogMethod *homeMethod;
sqInt isBackwardBranch;
Expand Down

0 comments on commit ff88ad7

Please sign in to comment.