Skip to content

Commit b90d60f

Browse files
eliotmirandaeliotmiranda
committed
CogVM source as per Name: VMMaker.oscog-eem.2776
Oops! Fix a regression from VMMaker.oscog-eem.2774. Slang isn't smart enough to emit types for C's funky example typing for functions that return pointers to functions, so we have to manually type genInvokeInterpretTrampoline.
1 parent ae724ff commit b90d60f

36 files changed

+186
-186
lines changed

‎nsspur64src/vm/cogit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
*/
44

55

‎nsspur64src/vm/cogitARMv8.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
55
CogARMv8Compiler ClosedVMMaker-eem.95 uuid: 3ad743c8-1af0-4b4e-b6d5-eb052af049cb
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2\n\
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd\n\
88
CogARMv8Compiler ClosedVMMaker-eem.95 uuid: 3ad743c8-1af0-4b4e-b6d5-eb052af049cb " __DATE__ ;
99
char *__cogitBuildInfo = __buildInfo;
1010

@@ -757,7 +757,7 @@ static void generateTrampolines(void);
757757
static BytecodeDescriptor * NoDbgRegParms generatorForPC(sqInt pc);
758758
static void genGetLeafCallStackPointers(void);
759759
static usqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name);
760-
static void (*)(void) genInvokeInterpretTrampoline(void);
760+
static void (*genInvokeInterpretTrampoline(void))(void) ;
761761
static void NoDbgRegParms genLoadInlineCacheWithSelector(sqInt selectorIndex);
762762
static usqInt genNonLocalReturnTrampoline(void);
763763
static usqInt NoDbgRegParms genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString);
@@ -11889,8 +11889,8 @@ genInnerPICAbortTrampoline(char *name)
1188911889
this is the caller's responsibility), and invoke interpret PDQ. */
1189011890

1189111891
/* Cogit>>#genInvokeInterpretTrampoline */
11892-
static void (*)(void)
11893-
genInvokeInterpretTrampoline(void)
11892+
static void (*genInvokeInterpretTrampoline(void))(void)
11893+
1189411894
{
1189511895
sqInt address;
1189611896
AbstractInstruction *anInstruction;

‎nsspur64src/vm/cogitX64SysV.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2 " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -635,7 +635,7 @@ static void generateTrampolines(void);
635635
static BytecodeDescriptor * NoDbgRegParms generatorForPC(sqInt pc);
636636
static void genGetLeafCallStackPointers(void);
637637
static usqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name);
638-
static void (*)(void) genInvokeInterpretTrampoline(void);
638+
static void (*genInvokeInterpretTrampoline(void))(void) ;
639639
static void NoDbgRegParms genLoadInlineCacheWithSelector(sqInt selectorIndex);
640640
static usqInt genNonLocalReturnTrampoline(void);
641641
static usqInt NoDbgRegParms genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString);
@@ -7787,8 +7787,8 @@ genInnerPICAbortTrampoline(char *name)
77877787
this is the caller's responsibility), and invoke interpret PDQ. */
77887788

77897789
/* Cogit>>#genInvokeInterpretTrampoline */
7790-
static void (*)(void)
7791-
genInvokeInterpretTrampoline(void)
7790+
static void (*genInvokeInterpretTrampoline(void))(void)
7791+
77927792
{
77937793
sqInt address1;
77947794
AbstractInstruction *anInstruction;

‎nsspur64src/vm/cogitX64WIN64.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2 " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -635,7 +635,7 @@ static void generateTrampolines(void);
635635
static BytecodeDescriptor * NoDbgRegParms generatorForPC(sqInt pc);
636636
static void genGetLeafCallStackPointers(void);
637637
static usqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name);
638-
static void (*)(void) genInvokeInterpretTrampoline(void);
638+
static void (*genInvokeInterpretTrampoline(void))(void) ;
639639
static void NoDbgRegParms genLoadInlineCacheWithSelector(sqInt selectorIndex);
640640
static usqInt genNonLocalReturnTrampoline(void);
641641
static usqInt NoDbgRegParms genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString);
@@ -7795,8 +7795,8 @@ genInnerPICAbortTrampoline(char *name)
77957795
this is the caller's responsibility), and invoke interpret PDQ. */
77967796

77977797
/* Cogit>>#genInvokeInterpretTrampoline */
7798-
static void (*)(void)
7799-
genInvokeInterpretTrampoline(void)
7798+
static void (*genInvokeInterpretTrampoline(void))(void)
7799+
78007800
{
78017801
sqInt address1;
78027802
AbstractInstruction *anInstruction;

‎nsspursrc/vm/cogit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
*/
44

55

‎nsspursrc/vm/cogitARMv5.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2 " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -697,7 +697,7 @@ static void generateTrampolines(void);
697697
static BytecodeDescriptor * NoDbgRegParms generatorForPC(sqInt pc);
698698
static void genGetLeafCallStackPointers(void);
699699
static usqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name);
700-
static void (*)(void) genInvokeInterpretTrampoline(void);
700+
static void (*genInvokeInterpretTrampoline(void))(void) ;
701701
static void NoDbgRegParms genLoadInlineCacheWithSelector(sqInt selectorIndex);
702702
static usqInt genNonLocalReturnTrampoline(void);
703703
static usqInt NoDbgRegParms genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString);
@@ -12377,8 +12377,8 @@ genInnerPICAbortTrampoline(char *name)
1237712377
this is the caller's responsibility), and invoke interpret PDQ. */
1237812378

1237912379
/* Cogit>>#genInvokeInterpretTrampoline */
12380-
static void (*)(void)
12381-
genInvokeInterpretTrampoline(void)
12380+
static void (*genInvokeInterpretTrampoline(void))(void)
12381+
1238212382
{
1238312383
sqInt address;
1238412384
AbstractInstruction *anInstruction;

‎nsspursrc/vm/cogitIA32.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2 " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -686,7 +686,7 @@ static void generateTrampolines(void);
686686
static BytecodeDescriptor * NoDbgRegParms generatorForPC(sqInt pc);
687687
static void genGetLeafCallStackPointers(void);
688688
static usqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name);
689-
static void (*)(void) genInvokeInterpretTrampoline(void);
689+
static void (*genInvokeInterpretTrampoline(void))(void) ;
690690
static void NoDbgRegParms genLoadInlineCacheWithSelector(sqInt selectorIndex);
691691
static usqInt genNonLocalReturnTrampoline(void);
692692
static usqInt NoDbgRegParms genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString);
@@ -12053,8 +12053,8 @@ genInnerPICAbortTrampoline(char *name)
1205312053
this is the caller's responsibility), and invoke interpret PDQ. */
1205412054

1205512055
/* Cogit>>#genInvokeInterpretTrampoline */
12056-
static void (*)(void)
12057-
genInvokeInterpretTrampoline(void)
12056+
static void (*genInvokeInterpretTrampoline(void))(void)
12057+
1205812058
{
1205912059
AbstractInstruction *abstractInstruction;
1206012060
sqInt address1;

‎nsspursrc/vm/cogitMIPSEL.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2 " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -636,7 +636,7 @@ static void generateTrampolines(void);
636636
static BytecodeDescriptor * NoDbgRegParms generatorForPC(sqInt pc);
637637
static void genGetLeafCallStackPointers(void);
638638
static usqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name);
639-
static void (*)(void) genInvokeInterpretTrampoline(void);
639+
static void (*genInvokeInterpretTrampoline(void))(void) ;
640640
static void NoDbgRegParms genLoadInlineCacheWithSelector(sqInt selectorIndex);
641641
static usqInt genNonLocalReturnTrampoline(void);
642642
static usqInt NoDbgRegParms genNSSendTrampolineFornumArgsenclosingObjectCheckcalled(void *aRoutine, sqInt numArgs, sqInt eoCheckFlag, char *aString);
@@ -6042,7 +6042,7 @@ configureMNUCPICmethodOperandnumArgsdelta(CogMethod *cPIC, sqInt methodOperand,
60426042
static sqInt NoDbgRegParms
60436043
cPICCompactAndIsNowEmpty(CogMethod *cPIC)
60446044
{
6045-
usqInt entryPoint;
6045+
sqInt entryPoint;
60466046
sqInt followingAddress;
60476047
sqInt i;
60486048
sqInt methods[MaxCPICCases];
@@ -6143,7 +6143,7 @@ cPICHasForwardedClass(CogMethod *cPIC)
61436143
static sqInt NoDbgRegParms
61446144
cPICHasFreedTargets(CogMethod *cPIC)
61456145
{
6146-
usqInt entryPoint;
6146+
sqInt entryPoint;
61476147
sqInt i;
61486148
sqInt pc;
61496149
CogMethod *targetMethod;
@@ -7647,8 +7647,8 @@ genInnerPICAbortTrampoline(char *name)
76477647
this is the caller's responsibility), and invoke interpret PDQ. */
76487648

76497649
/* Cogit>>#genInvokeInterpretTrampoline */
7650-
static void (*)(void)
7651-
genInvokeInterpretTrampoline(void)
7650+
static void (*genInvokeInterpretTrampoline(void))(void)
7651+
76527652
{
76537653
sqInt address;
76547654
AbstractInstruction *anInstruction;
@@ -10329,7 +10329,7 @@ static void NoDbgRegParms
1032910329
relocateCallsInClosedPIC(CogMethod *cPIC)
1033010330
{
1033110331
sqInt callDelta;
10332-
usqInt entryPoint;
10332+
sqInt entryPoint;
1033310333
sqInt i;
1033410334
sqInt pc;
1033510335
sqLong refDelta;

‎spur64src/vm/cogit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
*/
44

55

‎spur64src/vm/cogitARMv8.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
2+
CCodeGenerator VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd
55
CogARMv8Compiler ClosedVMMaker-eem.95 uuid: 3ad743c8-1af0-4b4e-b6d5-eb052af049cb
66
*/
7-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2775 uuid: 5277c7af-b6e2-42b2-879d-eab85ff574c2\n\
7+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2776 uuid: 9f8a0f46-28c8-4139-8366-088e6e75e4cd\n\
88
CogARMv8Compiler ClosedVMMaker-eem.95 uuid: 3ad743c8-1af0-4b4e-b6d5-eb052af049cb " __DATE__ ;
99
char *__cogitBuildInfo = __buildInfo;
1010

@@ -755,7 +755,7 @@ static void generateTrampolines(void);
755755
static BytecodeDescriptor * NoDbgRegParms generatorForPC(sqInt pc);
756756
static void genGetLeafCallStackPointers(void);
757757
static usqInt NoDbgRegParms genInnerPICAbortTrampoline(char *name);
758-
static void (*)(void) genInvokeInterpretTrampoline(void);
758+
static void (*genInvokeInterpretTrampoline(void))(void) ;
759759
static void NoDbgRegParms genLoadInlineCacheWithSelector(sqInt selectorIndex);
760760
static usqInt genNonLocalReturnTrampoline(void);
761761
static usqInt genReturnToInterpreterTrampoline(void);
@@ -6782,7 +6782,7 @@ rewriteImm19JumpBeforetarget(AbstractInstruction * self_in_rewriteImm19JumpBefor
67826782
static sqInt NoDbgRegParms
67836783
rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBeforetarget, sqInt followingAddress, sqInt targetAddress)
67846784
{
6785-
usqInt instrOpcode;
6785+
sqInt instrOpcode;
67866786
sqInt mcpc;
67876787
sqInt offset;
67886788

@@ -6792,7 +6792,7 @@ rewriteImm26JumpBeforetarget(AbstractInstruction * self_in_rewriteImm26JumpBefor
67926792
instrOpcode = ((instructionBeforeAddress(self_in_rewriteImm26JumpBeforetarget, followingAddress))) >> 26;
67936793
assert((instrOpcode == 5)
67946794
|| (instrOpcode == 37));
6795-
codeLong32Atput(mcpc, (instrOpcode << 26) + (((offset) >> 2) & (0x3FFFFFF)));
6795+
codeLong32Atput(mcpc, (((sqInt)((usqInt)(instrOpcode) << 26))) + (((offset) >> 2) & (0x3FFFFFF)));
67966796
return 4;
67976797
}
67986798

@@ -11856,8 +11856,8 @@ genInnerPICAbortTrampoline(char *name)
1185611856
this is the caller's responsibility), and invoke interpret PDQ. */
1185711857

1185811858
/* Cogit>>#genInvokeInterpretTrampoline */
11859-
static void (*)(void)
11860-
genInvokeInterpretTrampoline(void)
11859+
static void (*genInvokeInterpretTrampoline(void))(void)
11860+
1186111861
{
1186211862
sqInt address;
1186311863
AbstractInstruction *anInstruction;

0 commit comments

Comments
 (0)