[Vm-dev] [commit][3584] Mac OS X gnu makefiles:
commits at squeakvm.org
commits at squeakvm.org
Thu Feb 11 20:07:38 UTC 2016
Revision: 3584
Author: eliot
Date: 2016-02-11 12:07:36 -0800 (Thu, 11 Feb 2016)
Log Message:
-----------
Mac OS X gnu makefiles:
Make the Newspeak VMs build (must include sound & host window plugins).
Factor out the name mangling necessary to put spaces in the Newspeak exe & icns
into common/Makefile.app.newspeak.
Factor out chosing the relevant plugin Makefile into a function.
Add a dummy ioDrainEventQueue to the iOS source.
Freshen the spur VM source which was accidentally unofficial.
Modified Paths:
--------------
branches/Cog/build.macos32x86/common/Makefile.app
branches/Cog/build.macos32x86/common/Makefile.plugin
branches/Cog/build.macos32x86/common/Makefile.vm
branches/Cog/build.macos32x86/glue.cog.spur/Makefile
branches/Cog/build.macos32x86/glue.cog.spur/plugins.int
branches/Cog/build.macos32x86/glue.stack.spur/Makefile
branches/Cog/build.macos32x86/glue.stack.spur/plugins.int
branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile
branches/Cog/build.macos32x86/newspeak.cog.spur/plugins.int
branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile
branches/Cog/build.macos32x86/newspeak.stack.spur/plugins.int
branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int
branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int
branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int
branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int
branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int
branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
Added Paths:
-----------
branches/Cog/build.macos32x86/common/Makefile.app.newspeak
branches/Cog/build.macos32x86/newspeak.cog.spur/mvm
branches/Cog/build.macos32x86/newspeak.stack.spur/mvm
branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/
branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/Makefile
branches/Cog/platforms/iOS/plugins/FileCopyPlugin/
branches/Cog/platforms/iOS/plugins/FileCopyPlugin/Makefile
branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist
branches/Cog/platforms/iOS/vm/OSX/NewspeakVirtualMachine.icns
Removed Paths:
-------------
branches/Cog/platforms/iOS/vm/OSX/Newspeak Virtual Machine.icns
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.macos32x86/common/Makefile.app
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/common/Makefile.app 2016-02-11 20:07:36 UTC (rev 3584)
@@ -54,7 +54,7 @@
$(VMEXE): vm $(OBJDIR)/$(VM)
mkdir -p $(APP)/Contents/MacOS
- cp $(OBJDIR)/$(VM) $(APP)/Contents/MacOS
+ cp -p $(OBJDIR)/$(VM) $(APP)/Contents/MacOS
$(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle
mkdir -p $(APP)/Contents/Resources
@@ -65,6 +65,7 @@
sed "s/\$$(VERSION)/`getversion VERSION_TAG`/" $< | \
sed "s/\$$(VERSION_NUMBER)/`getversion VERSION_NUMBER`/" | \
sed "s/\$$(VERSION_TAG)/`getversion VERSION_TAG`/" | \
+ sed "s/\$$(VIRTUAL_MACHINE_NICKNAME)/`getversion VIRTUAL_MACHINE_NICKNAME`/" | \
sed "s/\$$(VM_NICKNAME)/`getversion VM_NICKNAME`/" > $@
$(VMMENUNIB): $(PLATDIR)/iOS/vm/English.lproj/MainMenu.xib
Added: branches/Cog/build.macos32x86/common/Makefile.app.newspeak
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.app.newspeak (rev 0)
+++ branches/Cog/build.macos32x86/common/Makefile.app.newspeak 2016-02-11 20:07:36 UTC (rev 3584)
@@ -0,0 +1,27 @@
+##############################################################################
+# Generic Makefile for Mac OS X Newspeak or Glue Cocoa VM
+#
+
+# The caller should set VMSRCDIR to point to the relevant VM source
+# e.g. VMSRCDIR:= ../../nsspursrc/vm
+
+VM:=NewspeakVirtualMachine
+SYSTEM:=Newspeak
+
+APPPOST:=renameExe renameIcon
+
+# Now include the Makefile proper, which is common to all Mac OS builds.
+#
+include ../common/Makefile.app
+
+# Rename NewspeakVirtualMachine to the problematic Newspeak Virtual Machine
+
+renameExe: $(APP)/Contents/MacOS/NewspeakVirtualMachine
+ mv $(APP)/Contents/MacOS/NewspeakVirtualMachine \
+ "$(APP)/Contents/MacOS/Newspeak Virtual Machine"
+
+# Likewise, rename NewspeakVirtualMachine.icns
+
+renameIcon: $(APP)/Contents/Resources/NewspeakVirtualMachine.icns
+ mv $(APP)/Contents/Resources/NewspeakVirtualMachine.icns \
+ "$(APP)/Contents/Resources/Newspeak Virtual Machine.icns"
Modified: branches/Cog/build.macos32x86/common/Makefile.plugin
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/common/Makefile.plugin 2016-02-11 20:07:36 UTC (rev 3584)
@@ -110,6 +110,7 @@
print-settings:
@echo ---------------- Makefile.plugin settings ------------------
@echo PWD=$(shell pwd)
+ @echo MAKEFILE=$(MAKEFILE)
@echo VPATH=$(VPATH)
@echo INCLUDES=$(INCLUDES)
@echo CFLAGS=$(CFLAGS)
Modified: branches/Cog/build.macos32x86/common/Makefile.vm
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/common/Makefile.vm 2016-02-11 20:07:36 UTC (rev 3584)
@@ -92,18 +92,18 @@
# VM config flags.
-ifeq ("$(CONFIGURATION)","product")
-OFLAGS:= -g -Os
-DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts
-INTERPFLAGS:=-D'VM_LABEL(foo)=0'
+ifeq ("$(CONFIGURATION)","debug")
+OFLAGS:= -g -O0 -fno-omit-frame-pointer
+DEBUGVM=-DDEBUGVM=1
+INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
else ifeq ("$(CONFIGURATION)","assert")
OFLAGS:= -g -O1 -fno-omit-frame-pointer
DEBUGVM=-DDEBUGVM=0
INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
-else
-OFLAGS:= -g -O0 -fno-omit-frame-pointer
-DEBUGVM=-DDEBUGVM=1
-INTERPFLAGS:=-DAllocationCheckFiller=0xADD4E55 -D'VM_LABEL(foo)=0'
+else # default CONFIGURATION=product
+OFLAGS:= -g -Os
+DEBUGVM=-DDEBUGVM=0 -DNDEBUG=1 # Define NDEBUG for production to exclude asserts
+INTERPFLAGS:=-D'VM_LABEL(foo)=0'
endif
TZ:=$(shell date +%Z)
@@ -181,6 +181,7 @@
@echo OBJDIR=$(OBJDIR)
@echo LIBS=$(LIBS)
@echo BUNDLES=$(BUNDLES)
+ @echo MAKEFILE=$(MAKEFILE)
@echo -----------------------------------------------------
print-objects:
@@ -208,33 +209,46 @@
#############################################################################
# Building plugins
#
-.PHONY: FORCE
+.PHONY: $(OBJDIR)/%.lib $(OBJDIR)/%.bundle %.lib %.bundle
+plugin-makefile = $(shell test -f $(OSXPLUGINSDIR)/$(1)/Makefile && echo $(OSXPLUGINSDIR)/$(1)/Makefile || echo $(COMMONDIR)/Makefile.plugin)
+
# Internal plugin. Build as lib then link in lib
# Check for Makefile in iOS plugins directory otherwise use default Makefile
# N.B. PLATDIR *must* be a relative path for this to work
-$(OBJDIR)/%.lib: getversion FORCE
+$(OBJDIR)/%.lib: getversion $(call plugin-makefile,$(*F))
@-mkdir -p $(BLDDIR)/$(*F)
+ test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true
$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
- -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \
+ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \
CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \
PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \
PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
LIBNAME=$(*F) COGDEFS="$(COGDEFS)" XDEFS=-DSQUEAK_BUILTIN_PLUGIN \
+ $(PLUGINHACK) \
$(OBJDIR)/$(*F).lib
+# It would be nice to have this abbreviation but it creates havoc eem 2/2016
+#%.lib: $(OBJDIR)/%.lib
+# make $(MAKEFLAGS) $<
+
# External plugin. Build as bundle and copy to vm dir ($(OBJDIR)).
# Check for Makefile in iOS plugins directory otherwise use default Makefile
-$(OBJDIR)/%.bundle: getversion FORCE
+$(OBJDIR)/%.bundle: getversion $(call plugin-makefile,$(*F))
@-mkdir -p $(BLDDIR)/$(*F)
+ test $@ -ot $(call plugin-makefile,$(*F)) && rm $(OBJDIR)/$(*F).lib || true
$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
- -f $(shell test -f $(OSXPLUGINSDIR)/$(*F)/Makefile && echo $(OSXPLUGINSDIR)/$(*F)/Makefile || echo $(COMMONDIR)/Makefile.plugin) \
+ -f $(call plugin-makefile,$(*F)) MAKEFILE=$(call plugin-makefile,$(*F)) \
CONFIGURATION=$(CONFIGURATION) ARCH=$(TARGET_ARCH) \
PLATDIR=$(PLATDIR) BASEDIR=$(BASEDIR) \
PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
- COGDEFS="$(COGDEFS)" LIBNAME=$(*F) $(OBJDIR)/$(*F).bundle
+ LIBNAME=$(*F) COGDEFS="$(COGDEFS)" \
+ $(PLUGINHACK) \
+ $(OBJDIR)/$(*F).bundle
-FORCE:
+# It would be nice to have this abbreviation but it creates havoc eem 2/2016
+#%.bundle: $(OBJDIR)/%.bundle
+# make $(MAKEFLAGS) $<
#############################################################################
# Extra specific dependencies
Modified: branches/Cog/build.macos32x86/glue.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/glue.cog.spur/Makefile 2016-02-11 20:07:36 UTC (rev 3584)
@@ -1,12 +1,9 @@
##############################################################################
-# Makefile for Mac OS X Cog Spur Newspeak Cocoa VM using clang and gnu make 3.81
+# Makefile for Mac OS X Cog Spur Glue Cocoa VM using clang and gnu make 3.81
# Do make init to allow make -n to function.
#
VMSRCDIR:= ../../nsspursrc/vm
-VM:=Newspeak Virtual Machine
-SYSTEM:=Newspeak
+COGDEFS:=-DEnforceAccessControl=0
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common/Makefile.app
+include ../common/Makefile.app.newspeak
Modified: branches/Cog/build.macos32x86/glue.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/glue.cog.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -10,6 +10,7 @@
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
+HostWindowPlugin \
ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
@@ -20,6 +21,7 @@
RePlugin \
SecurityPlugin \
SocketPlugin \
+SoundPlugin \
SurfacePlugin \
UUIDPlugin \
UnixOSProcessPlugin \
Modified: branches/Cog/build.macos32x86/glue.stack.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/glue.stack.spur/Makefile 2016-02-11 20:07:36 UTC (rev 3584)
@@ -1,12 +1,9 @@
##############################################################################
-# Makefile for Mac OS X Stack Spur Newspeak Cocoa VM using clang and gnu make 3.81
+# Makefile for Mac OS X Stack Spur Glue Cocoa VM using clang and gnu make 3.81
# Do make init to allow make -n to function.
#
VMSRCDIR:= ../../nsspurstacksrc/vm
-VM:=Newspeak Virtual Machine
-SYSTEM:=Newspeak
+COGDEFS:=-DEnforceAccessControl=0
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common/Makefile.app
+include ../common/Makefile.app.newspeak
Modified: branches/Cog/build.macos32x86/glue.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/glue.stack.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -10,6 +10,7 @@
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
+HostWindowPlugin \
ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
@@ -20,6 +21,7 @@
RePlugin \
SecurityPlugin \
SocketPlugin \
+SoundPlugin \
SurfacePlugin \
UUIDPlugin \
UnixOSProcessPlugin \
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/Makefile 2016-02-11 20:07:36 UTC (rev 3584)
@@ -4,9 +4,5 @@
#
VMSRCDIR:= ../../nsspursrc/vm
-VM:=Newspeak Virtual Machine
-SYSTEM:=Newspeak
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common/Makefile.app
+include ../common/Makefile.app.newspeak
Added: branches/Cog/build.macos32x86/newspeak.cog.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/mvm (rev 0)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/mvm 2016-02-11 20:07:36 UTC (rev 3584)
@@ -0,0 +1,4 @@
+#!/bin/bash
+make debug 2>&1 | tee LOGD
+make assert 2>&1 | tee LOGA
+make 2>&1 | tee LOGF
Property changes on: branches/Cog/build.macos32x86/newspeak.cog.spur/mvm
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -10,6 +10,7 @@
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
+HostWindowPlugin \
ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
@@ -20,6 +21,7 @@
RePlugin \
SecurityPlugin \
SocketPlugin \
+SoundPlugin \
SurfacePlugin \
UUIDPlugin \
UnixOSProcessPlugin \
Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/Makefile 2016-02-11 20:07:36 UTC (rev 3584)
@@ -1,12 +1,8 @@
##############################################################################
-# Makefile for Mac OS X Cog Spur Newspeak Cocoa VM using clang and gnu make 3.81
+# Makefile for Mac OS X Stack Spur Newspeak Cocoa VM using clang and gnu make 3.81
# Do make init to allow make -n to function.
#
VMSRCDIR:= ../../nsspurstacksrc/vm
-VM:=Newspeak Virtual Machine
-SYSTEM:=Newspeak
-# Now include the Makefile proper, which is common to all Mac OS builds.
-#
-include ../common/Makefile.app
+include ../common/Makefile.app.newspeak
Added: branches/Cog/build.macos32x86/newspeak.stack.spur/mvm
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/mvm (rev 0)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/mvm 2016-02-11 20:07:36 UTC (rev 3584)
@@ -0,0 +1,4 @@
+#!/bin/bash
+make debug 2>&1 | tee LOGD
+make assert 2>&1 | tee LOGA
+make 2>&1 | tee LOGF
Property changes on: branches/Cog/build.macos32x86/newspeak.stack.spur/mvm
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -10,6 +10,7 @@
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
+HostWindowPlugin \
ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
@@ -20,6 +21,7 @@
RePlugin \
SecurityPlugin \
SocketPlugin \
+SoundPlugin \
SurfacePlugin \
UUIDPlugin \
UnixOSProcessPlugin \
Modified: branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/pharo.cog.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -2,6 +2,7 @@
INTERNAL_PLUGINS = \
ADPCMCodecPlugin \
AioPlugin \
+AsynchFilePlugin \
B2DPlugin \
BitBltPlugin \
BMPReadWriterPlugin \
@@ -30,5 +31,4 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
-# AsynchFilePlugin \
# JoystickTabletPlugin
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -2,6 +2,7 @@
INTERNAL_PLUGINS = \
ADPCMCodecPlugin \
AioPlugin \
+AsynchFilePlugin \
B2DPlugin \
BitBltPlugin \
BMPReadWriterPlugin \
@@ -30,5 +31,4 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
-# AsynchFilePlugin \
# JoystickTabletPlugin
Modified: branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/squeak.cog.v3/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -2,6 +2,7 @@
INTERNAL_PLUGINS = \
ADPCMCodecPlugin \
AioPlugin \
+AsynchFilePlugin \
B2DPlugin \
BitBltPlugin \
BMPReadWriterPlugin \
@@ -30,5 +31,4 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
-# AsynchFilePlugin \
# JoystickTabletPlugin
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -2,6 +2,7 @@
INTERNAL_PLUGINS = \
ADPCMCodecPlugin \
AioPlugin \
+AsynchFilePlugin \
B2DPlugin \
BitBltPlugin \
BMPReadWriterPlugin \
@@ -30,5 +31,4 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
-# AsynchFilePlugin \
# JoystickTabletPlugin
Modified: branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/squeak.stack.spur/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -2,6 +2,7 @@
INTERNAL_PLUGINS = \
ADPCMCodecPlugin \
AioPlugin \
+AsynchFilePlugin \
B2DPlugin \
BitBltPlugin \
BMPReadWriterPlugin \
@@ -30,5 +31,4 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
-# AsynchFilePlugin \
# JoystickTabletPlugin
Modified: branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/build.macos32x86/squeak.stack.v3/plugins.int 2016-02-11 20:07:36 UTC (rev 3584)
@@ -2,6 +2,7 @@
INTERNAL_PLUGINS = \
ADPCMCodecPlugin \
AioPlugin \
+AsynchFilePlugin \
B2DPlugin \
BitBltPlugin \
BMPReadWriterPlugin \
@@ -30,5 +31,4 @@
SurfacePlugin \
UUIDPlugin \
VMProfileMacSupportPlugin \
-# AsynchFilePlugin \
# JoystickTabletPlugin
Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
===================================================================
--- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2016-02-11 20:07:36 UTC (rev 3584)
@@ -144,6 +144,8 @@
if (printit("VM_NICKNAME"))
printf("%s\n", NICKNAME " " OBJMEM " VM");
+ if (printit("VIRTUAL_MACHINE_NICKNAME"))
+ printf("%s\n", NICKNAME " " OBJMEM " Virtual Machine");
if (printit("VM_MONIKER"))
printf("%s\n", NICKNAME OBJMEM "VM");
if (printit("VM_VERSION"))
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Feb 10 21:05:09 PST 2016
+ Thu Feb 11 12:03:34 PST 2016
Added: branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/Makefile
===================================================================
--- branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/Makefile (rev 0)
+++ branches/Cog/platforms/iOS/plugins/AsynchFilePlugin/Makefile 2016-02-11 20:07:36 UTC (rev 3584)
@@ -0,0 +1,5 @@
+SRCDIRS:=../../platforms/unix/plugins/AsynchFilePlugin
+INCDIRS:=../../platforms/Cross/plugins/AsynchFilePlugin \
+ ../../platforms/unix/vm
+
+include ../common/Makefile.plugin
Added: branches/Cog/platforms/iOS/plugins/FileCopyPlugin/Makefile
===================================================================
--- branches/Cog/platforms/iOS/plugins/FileCopyPlugin/Makefile (rev 0)
+++ branches/Cog/platforms/iOS/plugins/FileCopyPlugin/Makefile 2016-02-11 20:07:36 UTC (rev 3584)
@@ -0,0 +1,6 @@
+SRCDIRS:=../../platforms/unix/plugins/FileCopyPlugin \
+ ../../platforms/unix/vm
+
+LIBSRC:=FileCopyPlugin.c sqUnixFileCopyPlugin.c sqUnixCharConv.c
+
+include ../common/Makefile.plugin
Modified: branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m
===================================================================
--- branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/platforms/iOS/vm/Common/Classes/sqSqueakEventsAPI.m 2016-02-11 20:07:36 UTC (rev 3584)
@@ -101,3 +101,11 @@
} */
return 0;
}
+
+#if NewspeakVM
+/* For now this is only here to make the linker happy;
+ the function really does something interesting only on Windows.
+ */
+void
+ioDrainEventQueue() {}
+#endif /* NewspeakVM */
Deleted: branches/Cog/platforms/iOS/vm/OSX/Newspeak Virtual Machine.icns
===================================================================
(Binary files differ)
Added: branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist (rev 0)
+++ branches/Cog/platforms/iOS/vm/OSX/Newspeak-Info.plist 2016-02-11 20:07:36 UTC (rev 3584)
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>BuildMachineOSBuild</key>
+ <string>10K549</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>image</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>Newspeak Virtual Machine.icns</string>
+ <key>CFBundleTypeName</key>
+ <string>Newspeak Image File</string>
+ <key>CFBundleTypeOSTypes</key>
+ <array>
+ <string>STim</string>
+ </array>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>sources</string>
+ <string>ns0</string>
+ <string>ns1</string>
+ <string>ns2</string>
+ <string>ns3</string>
+ <string>ns4</string>
+ <string>ns5</string>
+ <string>ns6</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>Newspeak Virtual Machine.icns</string>
+ <key>CFBundleTypeName</key>
+ <string>Newspeak Sources File</string>
+ <key>CFBundleTypeOSTypes</key>
+ <array>
+ <string>STso</string>
+ </array>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>changes</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>Newspeak Virtual Machine.icns</string>
+ <key>CFBundleTypeName</key>
+ <string>Newspeak Changes File</string>
+ <key>CFBundleTypeOSTypes</key>
+ <array>
+ <string>STch</string>
+ </array>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ </dict>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>bundle</string>
+ </array>
+ <key>CFBundleTypeIconFile</key>
+ <string>SqueakPlugin.icns</string>
+ <key>CFBundleTypeName</key>
+ <string>Squeak Plugin</string>
+ <key>CFBundleTypeOSTypes</key>
+ <array>
+ <string>BNDL</string>
+ </array>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ </dict>
+ </array>
+ <key>CFBundleExecutable</key>
+ <string>Newspeak Virtual Machine</string>
+ <key>CFBundleGetInfoString</key>
+ <string>Newspeak $(VIRTUAL_MACHINE_NICKNAME) $(VERSION_NUMBER) http://newspeaklanguage.org</string>
+ <key>CFBundleIconFile</key>
+ <string>Newspeak Virtual Machine.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.bracha.Newspeak</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>Newspeak Virtual Machine</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>Newspeak $(VIRTUAL_MACHINE_NICKNAME) $(VERSION_NUMBER)</string>
+ <key>CFBundleSignature</key>
+ <string>NSVM</string>
+ <key>CFBundleVersion</key>
+ <string>$(VERSION_NUMBER)</string>
+ <key>CGDisableCoalescedUpdates</key>
+ <true/>
+ <key>DTCompiler</key>
+ <string></string>
+ <key>DTPlatformBuild</key>
+ <string>10M2518</string>
+ <key>DTPlatformVersion</key>
+ <string>PG</string>
+ <key>DTSDKBuild</key>
+ <string>9L31a</string>
+ <key>DTSDKName</key>
+ <string>macosx10.5</string>
+ <key>DTXcode</key>
+ <string>0400</string>
+ <key>DTXcodeBuild</key>
+ <string>10M2518</string>
+ <key>LSBackgroundOnly</key>
+ <false/>
+ <key>LSMinimumSystemVersion</key>
+ <string>10.6.0</string>
+ <key>SqueakBrowserMouseCmdButton1</key>
+ <integer>3</integer>
+ <key>SqueakBrowserMouseCmdButton2</key>
+ <integer>3</integer>
+ <key>SqueakBrowserMouseCmdButton3</key>
+ <integer>2</integer>
+ <key>SqueakBrowserMouseControlButton1</key>
+ <integer>1</integer>
+ <key>SqueakBrowserMouseControlButton2</key>
+ <integer>3</integer>
+ <key>SqueakBrowserMouseControlButton3</key>
+ <integer>2</integer>
+ <key>SqueakBrowserMouseNoneButton1</key>
+ <integer>1</integer>
+ <key>SqueakBrowserMouseNoneButton2</key>
+ <integer>3</integer>
+ <key>SqueakBrowserMouseNoneButton3</key>
+ <integer>2</integer>
+ <key>SqueakBrowserMouseOptionButton1</key>
+ <integer>2</integer>
+ <key>SqueakBrowserMouseOptionButton2</key>
+ <integer>3</integer>
+ <key>SqueakBrowserMouseOptionButton3</key>
+ <integer>2</integer>
+ <key>SqueakDebug</key>
+ <integer>0</integer>
+ <key>SqueakEncodingType</key>
+ <string>UTF-8</string>
+ <key>SqueakExplicitWindowOpenNeeded</key>
+ <false/>
+ <key>SqueakFloatingWindowGetsFocus</key>
+ <true/>
+ <key>SqueakHasQuitWithoutSaving</key>
+ <false/>
+ <key>SqueakImageName</key>
+ <string>Newspeak.image</string>
+ <key>SqueakMaxHeapSize</key>
+ <integer>1073741824</integer>
+ <key>SqueakMouseCmdButton1</key>
+ <integer>3</integer>
+ <key>SqueakMouseCmdButton2</key>
+ <integer>3</integer>
+ <key>SqueakMouseCmdButton3</key>
+ <integer>2</integer>
+ <key>SqueakMouseControlButton1</key>
+ <integer>1</integer>
+ <key>SqueakMouseControlButton2</key>
+ <integer>3</integer>
+ <key>SqueakMouseControlButton3</key>
+ <integer>2</integer>
+ <key>SqueakMouseNoneButton1</key>
+ <integer>1</integer>
+ <key>SqueakMouseNoneButton2</key>
+ <integer>3</integer>
+ <key>SqueakMouseNoneButton3</key>
+ <integer>2</integer>
+ <key>SqueakMouseOptionButton1</key>
+ <integer>2</integer>
+ <key>SqueakMouseOptionButton2</key>
+ <integer>3</integer>
+ <key>SqueakMouseOptionButton3</key>
+ <integer>2</integer>
+ <key>SqueakPluginsBuiltInOrLocalOnly</key>
+ <false/>
+ <key>SqueakUIFlushPrimaryDeferNMilliseconds</key>
+ <integer>20</integer>
+ <key>SqueakUIFlushSecondaryCheckForPossibleNeedEveryNMilliseconds</key>
+ <integer>20</integer>
+ <key>SqueakUIFlushSecondaryCleanupDelayMilliseconds</key>
+ <integer>25</integer>
+ <key>SqueakUIFlushUseHighPercisionClock</key>
+ <true/>
+ <key>SqueakUnTrustedDirectory</key>
+ <string>~/Library/Preferences/Newspeak/Internet/Untrusted/</string>
+ <key>SqueakVMPathAnswersResources</key>
+ <true/>
+ <key>SqueakWindowAttribute</key>
+ <data>
+ ggAAHw==
+ </data>
+ <key>SqueakWindowHasTitle</key>
+ <true/>
+ <key>SqueakWindowType</key>
+ <integer>6</integer>
+ <key>UTExportedTypeDeclarations</key>
+ <array>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.data</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Newspeak Virtual Machine Image</string>
+ <key>UTTypeIconFile</key>
+ <string>NewspeakDocuments.icns</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.newspeakplatform.image-data</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>image</string>
+ </array>
+ </dict>
+ </dict>
+ <dict>
+ <key>UTTypeConformsTo</key>
+ <array>
+ <string>public.text</string>
+ </array>
+ <key>UTTypeDescription</key>
+ <string>Newspeak Virtual Machine Changes</string>
+ <key>UTTypeIconFile</key>
+ <string>NewspeakDocuments.icns</string>
+ <key>UTTypeIdentifier</key>
+ <string>org.newspeakplatform.changes-data</string>
+ <key>UTTypeTagSpecification</key>
+ <dict>
+ <key>public.filename-extension</key>
+ <array>
+ <string>changes</string>
+ </array>
+ </dict>
+ </dict>
+ </array>
+</dict>
+</plist>
Copied: branches/Cog/platforms/iOS/vm/OSX/NewspeakVirtualMachine.icns (from rev 3581, branches/Cog/platforms/iOS/vm/OSX/Newspeak Virtual Machine.icns)
===================================================================
(Binary files differ)
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/spursrc/vm/cogit.h 2016-02-11 20:07:36 UTC (rev 3584)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1670 uuid: 6ba2dd3d-ab44-468e-9184-1c85580f980b
+ CCodeGenerator VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36
*/
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/spursrc/vm/cointerp.c 2016-02-11 20:07:36 UTC (rev 3584)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36
from
- CoInterpreter * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae
+ CoInterpreter VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36
*/
-static char __buildInfo[] = "CoInterpreter * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -128,7 +128,7 @@
#define ActiveProcessIndex 1
#define AlternateHeaderHasPrimFlag 0x20000
#define AlternateHeaderNumLiteralsMask 0x7FFF
-#define AltLongStoreBytecode 234
+#define AltLongStoreBytecode 129
#define BecameActiveClassFlag 8
#define BecameCompiledMethodFlag 2
#define BecamePointerObjectFlag 1
@@ -2362,7 +2362,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives * VMMaker.oscog-eem.1669]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1674]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12957,7 +12957,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -46957,7 +46957,7 @@
static sqInt
imageSegmentVersion(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- int wholeWord;
+ sqInt wholeWord;
/* first data word, 'does' */
@@ -55905,7 +55905,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -61234,7 +61234,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -61477,7 +61477,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -61821,7 +61821,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -63612,7 +63612,7 @@
sqInt slotBytes4;
sqInt stopAddr;
sqInt swapFloatWords;
- int temp;
+ sqInt temp;
sqInt temp1;
sqInt wordAddr;
@@ -71752,7 +71752,7 @@
sqInt displayObj;
sqInt primFailCodeValue;
sqInt ptr;
- int reversed;
+ sqInt reversed;
sqInt w;
sqInt wordEndIndex;
sqInt wordStartIndex;
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/spursrc/vm/cointerp.h 2016-02-11 20:07:36 UTC (rev 3584)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36
*/
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-02-11 05:07:43 UTC (rev 3583)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2016-02-11 20:07:36 UTC (rev 3584)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36
from
- CoInterpreter * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae
+ CoInterpreter VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36
*/
-static char __buildInfo[] = "CoInterpreter * VMMaker.oscog-eem.1669 uuid: fb59e89d-14ad-4bad-a231-40f2d4f05dae " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1674 uuid: 36dea99c-e7f7-4ff4-a430-99a8ad340d36 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -131,7 +131,7 @@
#define ActiveProcessIndex 1
#define AlternateHeaderHasPrimFlag 0x20000
#define AlternateHeaderNumLiteralsMask 0x7FFF
-#define AltLongStoreBytecode 234
+#define AltLongStoreBytecode 129
#define BecameActiveClassFlag 8
#define BecameCompiledMethodFlag 2
#define BecamePointerObjectFlag 1
@@ -2365,7 +2365,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives * VMMaker.oscog-eem.1669]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1674]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -12966,7 +12966,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -46966,7 +46966,7 @@
static sqInt
imageSegmentVersion(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- int wholeWord;
+ sqInt wholeWord;
/* first data word, 'does' */
@@ -55914,7 +55914,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -61243,7 +61243,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -61486,7 +61486,7 @@
sqInt limit;
sqInt newEndOfMemory;
sqInt next;
- usqInt node;
+ sqInt node;
usqInt numSlots;
usqInt numSlots1;
SpurSegmentInfo *seg;
@@ -61830,7 +61830,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
@@ -63621,7 +63621,7 @@
sqInt slotBytes4;
sqInt stopAddr;
sqInt swapFloatWords;
- int temp;
+ sqInt temp;
sqInt temp1;
sqInt wordAddr;
@@ -71761,7 +71761,7 @@
sqInt displayObj;
sqInt primFailCodeValue;
sqInt ptr;
- int reversed;
+ sqInt reversed;
sqInt w;
sqInt wordEndIndex;
sqInt wordStartIndex;
More information about the Vm-dev
mailing list