Skip to content

Commit 9511755

Browse files
eliotmirandaeliotmiranda
committed
VMMaker.oscog-eem.3693
Fix a SNAFU with the inferred type of sizeOfSTArrayFromCPrimitive:. Cuz InterpreterProxy>>sizeOfSTArrayFromCPrimitive: says "not yet implemented" and returned self, its type was inferred as void. So hard-wire it to sqInt.
1 parent d0e7e46 commit 9511755

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

‎src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Automatically generated by
2-
VMPluginCodeGenerator VMMaker.oscog-eem.3692 uuid: dfc1faff-a80e-4cb8-aef8-830c0c0d50e5
2+
VMPluginCodeGenerator VMMaker.oscog-eem.3693 uuid: 1d723ae5-f289-4a4f-bbf2-78fd304a0ec0
33
(Compiler-eem.526)
44
from
5-
MiscPrimitivePlugin VMMaker.oscog-eem.3692 uuid: dfc1faff-a80e-4cb8-aef8-830c0c0d50e5
5+
MiscPrimitivePlugin VMMaker.oscog-eem.3693 uuid: 1d723ae5-f289-4a4f-bbf2-78fd304a0ec0
66
*/
7-
static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.3692 uuid: dfc1faff-a80e-4cb8-aef8-830c0c0d50e5 " __DATE__ ;
7+
static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.3693 uuid: 1d723ae5-f289-4a4f-bbf2-78fd304a0ec0 " __DATE__ ;
88

99

1010
#include "config.h"
@@ -69,7 +69,7 @@ static sqInt (*isWordsOrBytes)(sqInt oop);
6969
static sqInt (*methodReturnInteger)(sqInt integer);
7070
static sqInt (*methodReturnReceiver)(void);
7171
static sqInt (*primitiveFailFor)(sqInt reasonCode);
72-
static void (*sizeOfSTArrayFromCPrimitive)(void *cPtr);
72+
static sqInt (*sizeOfSTArrayFromCPrimitive)(void *cPtr);
7373
static sqInt (*stackIntegerValue)(sqInt offset);
7474
static sqInt (*stackValue)(sqInt offset);
7575
#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */
@@ -95,13 +95,13 @@ extern sqInt isWordsOrBytes(sqInt oop);
9595
extern sqInt methodReturnInteger(sqInt integer);
9696
extern sqInt methodReturnReceiver(void);
9797
extern sqInt primitiveFailFor(sqInt reasonCode);
98-
extern void sizeOfSTArrayFromCPrimitive(void *cPtr);
98+
extern sqInt sizeOfSTArrayFromCPrimitive(void *cPtr);
9999
extern sqInt stackIntegerValue(sqInt offset);
100100
extern sqInt stackValue(sqInt offset);
101101
extern
102102
#endif
103103
struct VirtualMachine* interpreterProxy;
104-
static const char *moduleName = "MiscPrimitivePlugin VMMaker.oscog-eem.3692 " INT_EXT;
104+
static const char *moduleName = "MiscPrimitivePlugin VMMaker.oscog-eem.3693 " INT_EXT;
105105

106106

107107
/*** Methods ***/

‎src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
VMPluginCodeGenerator VMMaker.oscog-eem.3692 uuid: dfc1faff-a80e-4cb8-aef8-830c0c0d50e5
2+
VMPluginCodeGenerator VMMaker.oscog-eem.3693 uuid: 1d723ae5-f289-4a4f-bbf2-78fd304a0ec0
33
(Compiler-eem.526)
44
from
55
UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.82 uuid: 1510486b-819a-4643-921a-1e39553cc4a8
@@ -243,7 +243,7 @@ static sqInt (*pushInteger)(sqInt integerValue);
243243
static sqInt (*pushRemappableOop)(sqInt oop);
244244
static sqInt (*signalSemaphoreWithIndex)(sqInt semaIndex);
245245
static sqInt (*signed32BitIntegerFor)(sqInt integerValue);
246-
static void (*sizeOfSTArrayFromCPrimitive)(void *cPtr);
246+
static sqInt (*sizeOfSTArrayFromCPrimitive)(void *cPtr);
247247
static sqInt (*stObjectatput)(sqInt array, sqInt index, sqInt value);
248248
static sqInt (*stSizeOf)(sqInt oop);
249249
static sqInt (*stackIntegerValue)(sqInt offset);
@@ -288,7 +288,7 @@ extern sqInt pushInteger(sqInt integerValue);
288288
extern sqInt pushRemappableOop(sqInt oop);
289289
extern sqInt signalSemaphoreWithIndex(sqInt semaIndex);
290290
extern sqInt signed32BitIntegerFor(sqInt integerValue);
291-
extern void sizeOfSTArrayFromCPrimitive(void *cPtr);
291+
extern sqInt sizeOfSTArrayFromCPrimitive(void *cPtr);
292292
extern sqInt stObjectatput(sqInt array, sqInt index, sqInt value);
293293
extern sqInt stSizeOf(sqInt oop);
294294
extern sqInt stackIntegerValue(sqInt offset);

‎src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
VMPluginCodeGenerator VMMaker.oscog-eem.3692 uuid: dfc1faff-a80e-4cb8-aef8-830c0c0d50e5
2+
VMPluginCodeGenerator VMMaker.oscog-eem.3693 uuid: 1d723ae5-f289-4a4f-bbf2-78fd304a0ec0
33
(Compiler-eem.526)
44
from
55
Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.82 uuid: 1510486b-819a-4643-921a-1e39553cc4a8
@@ -161,7 +161,7 @@ static sqInt (*push)(sqInt object);
161161
static sqInt (*pushInteger)(sqInt integerValue);
162162
static sqInt (*pushRemappableOop)(sqInt oop);
163163
static sqInt (*signalSemaphoreWithIndex)(sqInt semaIndex);
164-
static void (*sizeOfSTArrayFromCPrimitive)(void *cPtr);
164+
static sqInt (*sizeOfSTArrayFromCPrimitive)(void *cPtr);
165165
static sqInt (*stObjectatput)(sqInt array, sqInt index, sqInt value);
166166
static sqInt (*stSizeOf)(sqInt oop);
167167
static sqInt (*stackIntegerValue)(sqInt offset);
@@ -200,7 +200,7 @@ extern sqInt push(sqInt object);
200200
extern sqInt pushInteger(sqInt integerValue);
201201
extern sqInt pushRemappableOop(sqInt oop);
202202
extern sqInt signalSemaphoreWithIndex(sqInt semaIndex);
203-
extern void sizeOfSTArrayFromCPrimitive(void *cPtr);
203+
extern sqInt sizeOfSTArrayFromCPrimitive(void *cPtr);
204204
extern sqInt stObjectatput(sqInt array, sqInt index, sqInt value);
205205
extern sqInt stSizeOf(sqInt oop);
206206
extern sqInt stackIntegerValue(sqInt offset);

‎src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Automatically generated by
2-
VMPluginCodeGenerator VMMaker.oscog-eem.3692 uuid: dfc1faff-a80e-4cb8-aef8-830c0c0d50e5
2+
VMPluginCodeGenerator VMMaker.oscog-eem.3693 uuid: 1d723ae5-f289-4a4f-bbf2-78fd304a0ec0
33
(Compiler-eem.526)
44
from
55
XDisplayControlPlugin VMConstruction-Plugins-XDisplayControlPlugin.oscog-eem.20 uuid: 8f957df8-42a6-437b-b6a2-f9f954360ef0
@@ -80,7 +80,7 @@ static sqInt (*popRemappableOop)(void);
8080
static sqInt (*push)(sqInt object);
8181
static sqInt (*pushInteger)(sqInt integerValue);
8282
static sqInt (*pushRemappableOop)(sqInt oop);
83-
static void (*sizeOfSTArrayFromCPrimitive)(void *cPtr);
83+
static sqInt (*sizeOfSTArrayFromCPrimitive)(void *cPtr);
8484
static sqInt (*stackObjectValue)(sqInt offset);
8585
static sqInt (*trueObject)(void);
8686
#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */
@@ -97,7 +97,7 @@ extern sqInt popRemappableOop(void);
9797
extern sqInt push(sqInt object);
9898
extern sqInt pushInteger(sqInt integerValue);
9999
extern sqInt pushRemappableOop(sqInt oop);
100-
extern void sizeOfSTArrayFromCPrimitive(void *cPtr);
100+
extern sqInt sizeOfSTArrayFromCPrimitive(void *cPtr);
101101
extern sqInt stackObjectValue(sqInt offset);
102102
extern sqInt trueObject(void);
103103
extern

0 commit comments

Comments
 (0)