Skip to content

Commit

Permalink
Quick manual hack fix to the FFI plugins while a proper fix is obtained.
Browse files Browse the repository at this point in the history
Include an updated Source Generation Workspace with examples of the bisector.
  • Loading branch information
eliotmiranda committed Aug 24, 2024
1 parent 792dcb8 commit b15bc01
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion image/Source Generation Workspace.text
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"The target directory to which sources are generated is specified by VMMaker's DirNames class variable's #sourceTree entry. VMMaker's DirNames is set in its class initialize method. You can edit DirNames using e.g. an Inspector to change the default value of DirNames at: #sourceTree from '..' to the directory of your choice.""To generate all sources evaluate the following"[VMMaker generateAllConfigurationsUnderVersionControl] valueSupplyingAnswer: false."To be more selective choose any of the following"[VMMaker generateAllMTConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllCogConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllSpurConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllSpurLowcodeConfigurations] valueSupplyingAnswer: false.[VMMaker generateAllSpurConfigurations] valueSupplyingAnswer: false.[VMMaker generateAllSistaConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllStackConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateSqueakCogVM] valueSupplyingAnswer: false.[VMMaker generateSqueakStackVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCogVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCog64VM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCog64MTVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurRegisterCogVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCogSistaVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCogSista64VM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurStackVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurStack64VM] valueSupplyingAnswer: false.[VMMaker generateNewspeakSpurStack64VM] valueSupplyingAnswer: false.[VMMaker generateNewspeakSpurCogVM] valueSupplyingAnswer: false.[VMMaker generateNewspeakSpurCog64VM] valueSupplyingAnswer: false.VMMaker generateSpur32LeakChecker.VMMaker generateSpur64LeakChecker.VMMaker generateVMPlugins."To generate plugins open a VMMakerTool, drag and drop the plugins you want to build across to the External Plugins list, select each plugin and choose 'generate plugin' from the pop-up menu."VMMakerTool openInWorld.DELETE MEVMMaker generate3DICCPluginsVMMaker generateUtilityPrograms.[VMMaker generateAllNewspeakConfigurations] valueSupplyingAnswer: false.(Gnuifier on: (VMMaker rootDirectory fullNameFor: VMMaker sourceDirName, '/spur64.stack')) interpreterFilename: StackInterpreter sourceFileName; gnuify.1 tinyBenchmarks. '4,400,000,000 bytecodes/sec; 330,000,000 sends/sec'. '3,100,000,000 bytecodes/sec; 250,000,000 sends/sec'. '2,500,000,000 bytecodes/sec; 230,000,000 sends/sec'
"The target directory to which sources are generated is specified by VMMaker's DirNames class variable's #sourceTree entry. VMMaker's DirNames is set in its class initialize method. You can edit DirNames using e.g. an Inspector to change the default value of DirNames at: #sourceTree from '..' to the directory of your choice.""To generate all sources evaluate the following"[VMMaker generateAllConfigurationsUnderVersionControl] valueSupplyingAnswer: false."To be more selective choose any of the following"[VMMaker generateAllMTConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllCogConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllSpurConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllSpurLowcodeConfigurations] valueSupplyingAnswer: false.[VMMaker generateAllSpurConfigurations] valueSupplyingAnswer: false.[VMMaker generateAllSistaConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllStackConfigurationsUnderVersionControl] valueSupplyingAnswer: false.[VMMaker generateAllNewspeakConfigurations] valueSupplyingAnswer: false.[VMMaker generateSqueakCogVM] valueSupplyingAnswer: false.[VMMaker generateSqueakStackVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCogVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCog64VM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCog64MTVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurRegisterCogVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCogSistaVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurCogSista64VM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurStackVM] valueSupplyingAnswer: false.[VMMaker generateSqueakSpurStack64VM] valueSupplyingAnswer: false.VMMaker generateSpur32LeakChecker.VMMaker generateSpur64LeakChecker.VMMaker generateVMPlugins."To generate plugins open a VMMakerTool, drag and drop the plugins you want to build across to the External Plugins list, select each plugin and choose 'generate plugin' from the pop-up menu."VMMakerTool openInWorld."These may be useful in Slang development work."(Gnuifier on: (VMMaker rootDirectory fullNameFor: VMMaker sourceDirName, '/spur64.stack')) interpreterFilename: StackInterpreter sourceFileName; gnuify.(VMMakerFileBisector directory: '../src/spur64.stack' fileName: 'gcc3x-interp.c') import.(VMMakerFileBisector directory: '../src/spur64.cog' fileName: 'cogitX64SysV.c') import.
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from
ThreadedARM32FFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a
*/
static char __buildInfo[] = "ThreadedARM32FFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;
static char __buildInfo[] = "ThreadedARM32FFIPlugin * VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;


#include "config.h"
Expand Down Expand Up @@ -328,7 +328,7 @@ extern sqInt classIndexOf(sqInt);
static sqInt (*booleanValueOf)(sqInt obj);
static sqInt (*byteSizeOf)(sqInt oop);
static sqInt (*characterObjectOf)(int characterCode);
static usqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*classAlien)(void);
static sqInt (*classByteArray)(void);
static sqInt (*classExternalAddress)(void);
Expand Down Expand Up @@ -420,7 +420,7 @@ extern sqInt characterObjectOf(int characterCode);
# define characterObjectOf(characterCode) 0
#endif
#if VM_PROXY_MAJOR > 1 || (VM_PROXY_MAJOR == 1 && VM_PROXY_MINOR >= 13)
extern usqInt characterValueOf(sqInt aCharacter);
extern sqInt characterValueOf(sqInt aCharacter);
#else
# define characterValueOf(aCharacter) 0
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/SqueakFFIPrims/ARM64AppleFFIPlugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from
ThreadedARM64AppleFFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a
*/
static char __buildInfo[] = "ThreadedARM64AppleFFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;
static char __buildInfo[] = "ThreadedARM64AppleFFIPlugin * VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;


#include "config.h"
Expand Down Expand Up @@ -350,7 +350,7 @@ extern sqInt classIndexOf(sqInt);
static sqInt (*booleanValueOf)(sqInt obj);
static sqInt (*byteSizeOf)(sqInt oop);
static sqInt (*characterObjectOf)(int characterCode);
static usqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*classAlien)(void);
static sqInt (*classByteArray)(void);
static sqInt (*classExternalAddress)(void);
Expand Down Expand Up @@ -442,7 +442,7 @@ extern sqInt characterObjectOf(int characterCode);
# define characterObjectOf(characterCode) 0
#endif
#if VM_PROXY_MAJOR > 1 || (VM_PROXY_MAJOR == 1 && VM_PROXY_MINOR >= 13)
extern usqInt characterValueOf(sqInt aCharacter);
extern sqInt characterValueOf(sqInt aCharacter);
#else
# define characterValueOf(aCharacter) 0
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/SqueakFFIPrims/ARM64FFIPlugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from
ThreadedARM64FFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a
*/
static char __buildInfo[] = "ThreadedARM64FFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;
static char __buildInfo[] = "ThreadedARM64FFIPlugin * VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;


#include "config.h"
Expand Down Expand Up @@ -350,7 +350,7 @@ extern sqInt classIndexOf(sqInt);
static sqInt (*booleanValueOf)(sqInt obj);
static sqInt (*byteSizeOf)(sqInt oop);
static sqInt (*characterObjectOf)(int characterCode);
static usqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*classAlien)(void);
static sqInt (*classByteArray)(void);
static sqInt (*classExternalAddress)(void);
Expand Down Expand Up @@ -442,7 +442,7 @@ extern sqInt characterObjectOf(int characterCode);
# define characterObjectOf(characterCode) 0
#endif
#if VM_PROXY_MAJOR > 1 || (VM_PROXY_MAJOR == 1 && VM_PROXY_MINOR >= 13)
extern usqInt characterValueOf(sqInt aCharacter);
extern sqInt characterValueOf(sqInt aCharacter);
#else
# define characterValueOf(aCharacter) 0
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/SqueakFFIPrims/IA32FFIPlugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from
ThreadedIA32FFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a
*/
static char __buildInfo[] = "ThreadedIA32FFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;
static char __buildInfo[] = "ThreadedIA32FFIPlugin * VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;


#include "config.h"
Expand Down Expand Up @@ -320,7 +320,7 @@ extern sqInt classIndexOf(sqInt);
static sqInt (*booleanValueOf)(sqInt obj);
static sqInt (*byteSizeOf)(sqInt oop);
static sqInt (*characterObjectOf)(int characterCode);
static usqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*classAlien)(void);
static sqInt (*classByteArray)(void);
static sqInt (*classExternalAddress)(void);
Expand Down Expand Up @@ -412,7 +412,7 @@ extern sqInt characterObjectOf(int characterCode);
# define characterObjectOf(characterCode) 0
#endif
#if VM_PROXY_MAJOR > 1 || (VM_PROXY_MAJOR == 1 && VM_PROXY_MINOR >= 13)
extern usqInt characterValueOf(sqInt aCharacter);
extern sqInt characterValueOf(sqInt aCharacter);
#else
# define characterValueOf(aCharacter) 0
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/SqueakFFIPrims/RiscV64FFIPlugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from
ThreadedRiscV64FFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a
*/
static char __buildInfo[] = "ThreadedRiscV64FFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;
static char __buildInfo[] = "ThreadedRiscV64FFIPlugin * VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;


#include "config.h"
Expand Down Expand Up @@ -351,7 +351,7 @@ extern sqInt classIndexOf(sqInt);
static sqInt (*booleanValueOf)(sqInt obj);
static sqInt (*byteSizeOf)(sqInt oop);
static sqInt (*characterObjectOf)(int characterCode);
static usqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*classAlien)(void);
static sqInt (*classByteArray)(void);
static sqInt (*classExternalAddress)(void);
Expand Down Expand Up @@ -442,7 +442,7 @@ extern sqInt characterObjectOf(int characterCode);
# define characterObjectOf(characterCode) 0
#endif
#if VM_PROXY_MAJOR > 1 || (VM_PROXY_MAJOR == 1 && VM_PROXY_MINOR >= 13)
extern usqInt characterValueOf(sqInt aCharacter);
extern sqInt characterValueOf(sqInt aCharacter);
#else
# define characterValueOf(aCharacter) 0
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from
ThreadedX64SysVFFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a
*/
static char __buildInfo[] = "ThreadedX64SysVFFIPlugin VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;
static char __buildInfo[] = "ThreadedX64SysVFFIPlugin * VMMaker.oscog-eem.3445 uuid: bf34d535-d388-48bb-b497-6a6661b81d9a " __DATE__ ;


#include "config.h"
Expand Down Expand Up @@ -368,7 +368,7 @@ extern sqInt classIndexOf(sqInt);
static sqInt (*booleanValueOf)(sqInt obj);
static sqInt (*byteSizeOf)(sqInt oop);
static sqInt (*characterObjectOf)(int characterCode);
static usqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*classAlien)(void);
static sqInt (*classByteArray)(void);
static sqInt (*classExternalAddress)(void);
Expand Down Expand Up @@ -460,7 +460,7 @@ extern sqInt characterObjectOf(int characterCode);
# define characterObjectOf(characterCode) 0
#endif
#if VM_PROXY_MAJOR > 1 || (VM_PROXY_MAJOR == 1 && VM_PROXY_MINOR >= 13)
extern usqInt characterValueOf(sqInt aCharacter);
extern sqInt characterValueOf(sqInt aCharacter);
#else
# define characterValueOf(aCharacter) 0
#endif
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ extern sqInt classIndexOf(sqInt);
static sqInt (*booleanValueOf)(sqInt obj);
static sqInt (*byteSizeOf)(sqInt oop);
static sqInt (*characterObjectOf)(int characterCode);
static usqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*characterValueOf)(sqInt aCharacter);
static sqInt (*classAlien)(void);
static sqInt (*classByteArray)(void);
static sqInt (*classExternalAddress)(void);
Expand Down Expand Up @@ -422,7 +422,7 @@ extern sqInt characterObjectOf(int characterCode);
# define characterObjectOf(characterCode) 0
#endif
#if VM_PROXY_MAJOR > 1 || (VM_PROXY_MAJOR == 1 && VM_PROXY_MINOR >= 13)
extern usqInt characterValueOf(sqInt aCharacter);
extern sqInt characterValueOf(sqInt aCharacter);
#else
# define characterValueOf(aCharacter) 0
#endif
Expand Down

0 comments on commit b15bc01

Please sign in to comment.