Skip to content

Commit 2578ce3

Browse files
eliotmirandaeliotmiranda
committed
CogVM source as per VMMaker.oscog-eem.2924
Observe stricter type compatibility now that sqVirtualMachine.h's definitions are visible to internal plugins.
1 parent a9c6482 commit 2578ce3

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎platforms/Cross/vm/sqVirtualMachine.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ extern void *setInterruptCheckChain(void (*aFunction)(void));
2929
void (*setInterruptCheckChain(void (*aFunction)(void)))() { return 0; }
3030
#endif
3131

32+
/* InterpreterProxy methodsFor: 'BitBlt support' */
33+
sqInt loadBitBltFrom(sqInt bbOop);
34+
sqInt copyBits(void);
35+
sqInt copyBitsFromtoat(sqInt leftX, sqInt rightX, sqInt yValue);
36+
3237
#if VM_PROXY_MINOR > 10
3338
extern sqInt disownVM(sqInt flags);
3439
extern sqInt ownVM(sqInt threadIdAndFlags);

‎platforms/Cross/vm/sqVirtualMachine.h‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ typedef struct VirtualMachine {
231231
sqInt (*classExternalLibrary)(void);
232232
sqInt (*classExternalStructure)(void);
233233
void *(*ioLoadModuleOfLength)(sqInt modIndex, sqInt modLength);
234-
void *(*ioLoadSymbolOfLengthFromModule)(sqInt fnIndex, sqInt fnLength, sqInt handle);
234+
void *(*ioLoadSymbolOfLengthFromModule)(sqInt fnIndex, sqInt fnLength, void *handle);
235235
sqInt (*isInMemory)(sqInt address);
236236

237237
#endif
@@ -352,7 +352,7 @@ typedef struct VirtualMachine {
352352
#if VM_PROXY_MINOR > 11
353353
/* VMCallbackContext opaque type avoids all including setjmp.h & vmCallback.h */
354354
sqInt (*sendInvokeCallbackContext)(vmccp);
355-
sqInt (*returnAsThroughCallbackContext)(int, vmccp, sqInt);
355+
sqInt (*returnAsThroughCallbackContext)(sqInt, vmccp, sqInt);
356356
sqIntptr_t (*signedMachineIntegerValueOf)(sqInt);
357357
sqIntptr_t (*stackSignedMachineIntegerValue)(sqInt);
358358
usqIntptr_t (*positiveMachineIntegerValueOf)(sqInt);
@@ -402,7 +402,7 @@ typedef struct VirtualMachine {
402402
#endif
403403
} VirtualMachine;
404404

405-
# if (defined(SQUEAK_INTERNAL_PLUGIN) || defined(FOR_SVM_C)) \
405+
# if (defined(SQUEAK_BUILTIN_PLUGIN) || defined(FOR_SVM_C)) \
406406
&& !defined(SQ_USE_GLOBAL_STRUCT) // Prevent the interpereter seeing these
407407
/*** Function prototypes ***/
408408

@@ -554,19 +554,14 @@ sqInt vmEndianness(void);
554554
sqInt getInterruptPending(void);
555555
void error(const char *);
556556

557-
/* InterpreterProxy methodsFor: 'BitBlt support' */
558-
sqInt loadBitBltFrom(sqInt bbOop);
559-
sqInt copyBits(void);
560-
sqInt copyBitsFromtoat(sqInt leftX, sqInt rightX, sqInt yValue);
561-
562557
/* InterpreterProxy methodsFor: 'FFI support' */
563558
sqInt classExternalAddress(void);
564559
sqInt classExternalData(void);
565560
sqInt classExternalFunction(void);
566561
sqInt classExternalLibrary(void);
567562
sqInt classExternalStructure(void);
568563
void *ioLoadModuleOfLength(sqInt moduleNameIndex, sqInt moduleNameLength);
569-
void *ioLoadSymbolOfLengthFromModule(sqInt functionNameIndex, sqInt functionNameLength, sqInt moduleHandle);
564+
void *ioLoadSymbolOfLengthFromModule(sqInt functionNameIndex, sqInt functionNameLength, void *moduleHandle);
570565
sqInt isInMemory(sqInt address);
571566
sqInt classAlien(void); /* Alien FFI */
572567
sqInt classUnsafeAlien(void); /* Alien FFI */
@@ -579,7 +574,7 @@ sqInt *getStackPointer(void); /* Alien FFI */
579574
sqInt sendInvokeCallbackStackRegistersJmpbuf(sqInt thunkPtrAsInt, sqInt stackPtrAsInt, sqInt regsPtrAsInt, sqInt jmpBufPtrAsInt); /* Alien FFI */
580575
sqInt reestablishContextPriorToCallback(sqInt callbackContext); /* Alien FFI */
581576
sqInt sendInvokeCallbackContext(vmccp);
582-
sqInt returnAsThroughCallbackContext(int, vmccp, sqInt);
577+
sqInt returnAsThroughCallbackContext(sqInt, vmccp, sqInt);
583578
#endif /* VM_PROXY_MINOR > 8 */
584579
#if VM_PROXY_MINOR > 12 /* Spur */
585580
sqInt isImmediate(sqInt oop);

‎src/plugins/FilePlugin/FilePlugin.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
VMPluginCodeGenerator VMMaker.oscog-eem.2876 uuid: e5dba4f0-62a2-4385-a1aa-67c8617b9fd2
2+
VMPluginCodeGenerator VMMaker.oscog-eem.2924 uuid: 2e0ffedf-ac42-4dd1-9c66-e74498b366cc
33
from
4-
FilePlugin VMMaker.oscog-eem.2876 uuid: e5dba4f0-62a2-4385-a1aa-67c8617b9fd2
4+
FilePlugin VMMaker.oscog-eem.2924 uuid: 2e0ffedf-ac42-4dd1-9c66-e74498b366cc
55
*/
6-
static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.2876 uuid: e5dba4f0-62a2-4385-a1aa-67c8617b9fd2 " __DATE__ ;
6+
static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.2924 uuid: 2e0ffedf-ac42-4dd1-9c66-e74498b366cc " __DATE__ ;
77

88

99

@@ -126,7 +126,7 @@ static sqInt (*failed)(void);
126126
static sqInt (*falseObject)(void);
127127
static sqInt (*fetchPointerofObject)(sqInt index, sqInt oop);
128128
static void * (*firstIndexableField)(sqInt oop);
129-
static sqInt (*fullGC)(void);
129+
static void (*fullGC)(void);
130130
static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size);
131131
#if !defined(integerValueOf)
132132
static sqInt (*integerValueOf)(sqInt oop);
@@ -186,7 +186,7 @@ extern sqInt failed(void);
186186
extern sqInt falseObject(void);
187187
extern sqInt fetchPointerofObject(sqInt index, sqInt oop);
188188
extern void * firstIndexableField(sqInt oop);
189-
extern sqInt fullGC(void);
189+
extern void fullGC(void);
190190
extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size);
191191
#if !defined(integerValueOf)
192192
extern sqInt integerValueOf(sqInt oop);
@@ -247,7 +247,7 @@ extern sqInt unpinObject(sqInt anObject);
247247
extern
248248
#endif
249249
struct VirtualMachine* interpreterProxy;
250-
static const char *moduleName = "FilePlugin VMMaker.oscog-eem.2876 " INT_EXT;
250+
static const char *moduleName = "FilePlugin VMMaker.oscog-eem.2924 " INT_EXT;
251251
static void * sCCPfn;
252252
static void * sCDFfn;
253253
static void * sCDPfn;

‎src/plugins/IA32ABI/IA32ABI.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* Automatically generated by
2-
VMPluginCodeGenerator VMMaker.oscog-eem.2895 uuid: b23435ec-e114-4c55-9349-24ab4b95baec
2+
VMPluginCodeGenerator VMMaker.oscog-eem.2924 uuid: 2e0ffedf-ac42-4dd1-9c66-e74498b366cc
33
from
4-
IA32ABIPlugin VMMaker.oscog-eem.2895 uuid: b23435ec-e114-4c55-9349-24ab4b95baec
4+
IA32ABIPlugin VMMaker.oscog-eem.2924 uuid: 2e0ffedf-ac42-4dd1-9c66-e74498b366cc
55
*/
6-
static char __buildInfo[] = "IA32ABIPlugin VMMaker.oscog-eem.2895 uuid: b23435ec-e114-4c55-9349-24ab4b95baec " __DATE__ ;
6+
static char __buildInfo[] = "IA32ABIPlugin VMMaker.oscog-eem.2924 uuid: 2e0ffedf-ac42-4dd1-9c66-e74498b366cc " __DATE__ ;
77

88

99

@@ -185,7 +185,7 @@ static sqInt (*integerObjectOf)(sqInt value);
185185
static sqInt (*integerValueOf)(sqInt oop);
186186
#endif
187187
static void * (*ioLoadModuleOfLength)(sqInt moduleNameIndex, sqInt moduleLength);
188-
static void * (*ioLoadSymbolOfLengthFromModule)(sqInt functionNameIndex, sqInt functionLength, sqInt moduleHandle);
188+
static void * (*ioLoadSymbolOfLengthFromModule)(sqInt functionNameIndex, sqInt functionLength, void *moduleHandle);
189189
static sqInt (*isKindOfClass)(sqInt oop, sqInt aClass);
190190
static sqInt (*isArray)(sqInt oop);
191191
static sqInt (*isBytes)(sqInt oop);
@@ -243,7 +243,7 @@ extern sqInt integerObjectOf(sqInt value);
243243
extern sqInt integerValueOf(sqInt oop);
244244
#endif
245245
extern void * ioLoadModuleOfLength(sqInt moduleNameIndex, sqInt moduleLength);
246-
extern void * ioLoadSymbolOfLengthFromModule(sqInt functionNameIndex, sqInt functionLength, sqInt moduleHandle);
246+
extern void * ioLoadSymbolOfLengthFromModule(sqInt functionNameIndex, sqInt functionLength, void *moduleHandle);
247247
extern sqInt isKindOfClass(sqInt oop, sqInt aClass);
248248
extern sqInt isArray(sqInt oop);
249249
extern sqInt isBytes(sqInt oop);
@@ -288,7 +288,7 @@ extern sqInt trueObject(void);
288288
extern
289289
#endif
290290
struct VirtualMachine* interpreterProxy;
291-
static const char *moduleName = "IA32ABI VMMaker.oscog-eem.2895 " INT_EXT;
291+
static const char *moduleName = "IA32ABI VMMaker.oscog-eem.2924 " INT_EXT;
292292

293293

294294

0 commit comments

Comments
 (0)