Skip to content

Commit 020c80f

Browse files
committed
CogVM source as per VMMaker.oscog-eem.2751
Spur: Fix assert that checks for a valid function pointer on primitive failure that was confiused by FFI calls. Fix potential bug with primitive failure of external and FFI calls, making sure the first literal of the method is followed. The first literal is state used to cache an external call or define the signature of an ffi call. Make sure that FFI calls have a valid accessor depth. Fix a common speeling rorre. Slang: initGlobalStructure is never used; nuke its generator.
1 parent 28d52b5 commit 020c80f

File tree

128 files changed

+3806
-2311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+3806
-2311
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.2743 uuid: 6fa490eb-27b9-471e-9e46-6aa4ce54e382
2+
CCodeGenerator VMMaker.oscog-eem.2751 uuid: 877f34de-92b0-49a1-b34d-a6e97fe7aa4e
33
*/
44

55

nsspur64src/vm/cogitX64SysV.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2743 uuid: 6fa490eb-27b9-471e-9e46-6aa4ce54e382
2+
CCodeGenerator VMMaker.oscog-eem.2751 uuid: 877f34de-92b0-49a1-b34d-a6e97fe7aa4e
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2743 uuid: 6fa490eb-27b9-471e-9e46-6aa4ce54e382
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2751 uuid: 877f34de-92b0-49a1-b34d-a6e97fe7aa4e
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2743 uuid: 6fa490eb-27b9-471e-9e46-6aa4ce54e382 " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2751 uuid: 877f34de-92b0-49a1-b34d-a6e97fe7aa4e " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -26165,7 +26165,7 @@ compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(sqInt selectorReg, sqInt
2616526165
}
2616626166

2616726167

26168-
/* Compile a primitive. If possible, performance-critical primtiives will
26168+
/* Compile a primitive. If possible, performance-critical primitives will
2616926169
be generated by their own routines (primitiveGenerator). Otherwise,
2617026170
if there is a primitive at all, we call the C routine with the usual
2617126171
stack-switching dance, test the primFailCode and then either return
@@ -26918,7 +26918,7 @@ genLongUnconditionalForwardJump(void)
2691826918

2691926919

2692026920
/* Compile the code for a probe of the first-level method cache for a perform
26921-
primtiive. The selector is assumed to be in Arg0Reg. Defer to
26921+
primitive. The selector is assumed to be in Arg0Reg. Defer to
2692226922
adjustArgumentsForPerform: to
2692326923
adjust the arguments before the jump to the method. */
2692426924

nsspur64src/vm/cogitX64WIN64.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
CCodeGenerator VMMaker.oscog-eem.2743 uuid: 6fa490eb-27b9-471e-9e46-6aa4ce54e382
2+
CCodeGenerator VMMaker.oscog-eem.2751 uuid: 877f34de-92b0-49a1-b34d-a6e97fe7aa4e
33
from
4-
StackToRegisterMappingCogit VMMaker.oscog-eem.2743 uuid: 6fa490eb-27b9-471e-9e46-6aa4ce54e382
4+
StackToRegisterMappingCogit VMMaker.oscog-eem.2751 uuid: 877f34de-92b0-49a1-b34d-a6e97fe7aa4e
55
*/
6-
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2743 uuid: 6fa490eb-27b9-471e-9e46-6aa4ce54e382 " __DATE__ ;
6+
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.2751 uuid: 877f34de-92b0-49a1-b34d-a6e97fe7aa4e " __DATE__ ;
77
char *__cogitBuildInfo = __buildInfo;
88

99

@@ -26203,7 +26203,7 @@ compilePerformMethodCacheProbeForwithShiftbaseRegOrNone(sqInt selectorReg, sqInt
2620326203
}
2620426204

2620526205

26206-
/* Compile a primitive. If possible, performance-critical primtiives will
26206+
/* Compile a primitive. If possible, performance-critical primitives will
2620726207
be generated by their own routines (primitiveGenerator). Otherwise,
2620826208
if there is a primitive at all, we call the C routine with the usual
2620926209
stack-switching dance, test the primFailCode and then either return
@@ -26956,7 +26956,7 @@ genLongUnconditionalForwardJump(void)
2695626956

2695726957

2695826958
/* Compile the code for a probe of the first-level method cache for a perform
26959-
primtiive. The selector is assumed to be in Arg0Reg. Defer to
26959+
primitive. The selector is assumed to be in Arg0Reg. Defer to
2696026960
adjustArgumentsForPerform: to
2696126961
adjust the arguments before the jump to the method. */
2696226962

0 commit comments

Comments
 (0)