[Vm-dev] [commit][3426]
Doh! The EnforceAccessControl define is already set-up for C compiler
command-
commits at squeakvm.org
commits at squeakvm.org
Thu Aug 20 19:28:05 UTC 2015
Revision: 3426
Author: eliot
Date: 2015-08-20 12:28:03 -0700 (Thu, 20 Aug 2015)
Log Message:
-----------
Doh! The EnforceAccessControl define is already set-up for C compiler command-
line override. Use this and nuke the nac versions of the New3speak sources.
Modified Paths:
--------------
branches/Cog/build.linux32x86/glue.cog.spur/build/mvm
branches/Cog/build.linux32x86/glue.cog.spur/build.assert/mvm
branches/Cog/build.linux32x86/glue.cog.spur/build.assert.itimerheartbeat/mvm
branches/Cog/build.linux32x86/glue.cog.spur/build.debug/mvm
branches/Cog/build.linux32x86/glue.cog.spur/build.debug.itimerheartbeat/mvm
branches/Cog/build.linux32x86/glue.cog.spur/build.itimerheartbeat/mvm
branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
branches/Cog/nsspursrc/vm/cogit.h
branches/Cog/nsspursrc/vm/cointerp.c
branches/Cog/nsspursrc/vm/cointerp.h
branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
branches/Cog/nsspurstack64src/vm/interp.c
branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
Removed Paths:
-------------
branches/Cog/nsnacspursrc/
branches/Cog/nsnacspurstacksrc/
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.linux32x86/glue.cog.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/glue.cog.spur/build/mvm 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.linux32x86/glue.cog.spur/build/mvm 2015-08-20 19:28:03 UTC (rev 3426)
@@ -28,7 +28,7 @@
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
- CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
+ CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/glue.cog.spur/build.assert/mvm 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.linux32x86/glue.cog.spur/build.assert/mvm 2015-08-20 19:28:03 UTC (rev 3426)
@@ -24,7 +24,7 @@
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
- CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
+ CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.assert.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/glue.cog.spur/build.assert.itimerheartbeat/mvm 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.linux32x86/glue.cog.spur/build.assert.itimerheartbeat/mvm 2015-08-20 19:28:03 UTC (rev 3426)
@@ -24,7 +24,7 @@
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
- CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \
+ CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/glue.cog.spur/build.debug/mvm 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.linux32x86/glue.cog.spur/build.debug/mvm 2015-08-20 19:28:03 UTC (rev 3426)
@@ -24,7 +24,7 @@
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
- CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
+ CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.debug.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/glue.cog.spur/build.debug.itimerheartbeat/mvm 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.linux32x86/glue.cog.spur/build.debug.itimerheartbeat/mvm 2015-08-20 19:28:03 UTC (rev 3426)
@@ -24,7 +24,7 @@
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
- CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \
+ CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.linux32x86/glue.cog.spur/build.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/glue.cog.spur/build.itimerheartbeat/mvm 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.linux32x86/glue.cog.spur/build.itimerheartbeat/mvm 2015-08-20 19:28:03 UTC (rev 3426)
@@ -28,7 +28,7 @@
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CXX="g++ -m32" \
- CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \
+ CFLAGS="$OPT -msse2 -DEnforceAccessControl=0 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
rm -f vm/sqUnixMain.o # nuke version info
Modified: branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.macos32x86/glue.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426)
@@ -759,7 +759,7 @@
737D7E2513BAB68900347756 /* cogmethod.h */,
);
name = vm;
- path = ../../nsnacspursrc/vm;
+ path = ../../nsspursrc/vm;
sourceTree = "<group>";
};
F5F8AE0802EB4E090100013C /* Mac OS */ = {
@@ -1457,6 +1457,7 @@
GCC_OPTIMIZATION_LEVEL = 1;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1500,6 +1501,7 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1535,6 +1537,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=1",
"VM_LABEL(foo)=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1591,6 +1594,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1645,6 +1649,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1688,6 +1693,7 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=1",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1716,6 +1722,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1748,6 +1755,7 @@
GCC_DYNAMIC_NO_PIC = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)",
"MULTIPLEBYTECODESETS=1",
Modified: branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.macos32x86/glue.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426)
@@ -27,7 +27,7 @@
73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; };
8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
- DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsnacspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+ DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };
Modified: branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.macos32x86/glue.cog.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426)
@@ -16,7 +16,7 @@
08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
7308DE360B9614A4003B7CCD /* UnixOSProcessPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = UnixOSProcessPlugin.c; path = ../../../nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c; sourceTree = "<group>"; };
73662FE60F53864E00C64E7F /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = Cross/vm/sqMemoryAccess.h; sourceTree = "<group>"; };
- 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsnacspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+ 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
73662FE80F53864E00C64E7F /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "Mac OS/vm/config.h"; sourceTree = "<group>"; };
73662FE90F53864E00C64E7F /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "Mac OS/vm/sqConfig.h"; sourceTree = "<group>"; };
73662FEA0F53864E00C64E7F /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "Mac OS/vm/sqPlatformSpecific.h"; sourceTree = "<group>"; };
Modified: branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.macos32x86/glue.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426)
@@ -745,7 +745,7 @@
737D7E2413BAB68900347756 /* vmCallback.h */,
);
name = vm;
- path = ../../nsnacspurstacksrc/vm;
+ path = ../../nsspurstacksrc/vm;
sourceTree = "<group>";
};
F5F8AE0802EB4E090100013C /* Mac OS */ = {
@@ -1436,6 +1436,7 @@
GCC_OPTIMIZATION_LEVEL = 1;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1478,6 +1479,7 @@
ARCHS = i386;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1512,6 +1514,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=1",
"VM_LABEL(foo)=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1567,6 +1570,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1620,6 +1624,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1662,6 +1667,7 @@
ARCHS = i386;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUGVM=1",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1688,6 +1694,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
"DEBUGVM=0",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)",
"MULTIPLEBYTECODESETS=1",
@@ -1718,6 +1725,7 @@
ARCHS = i386;
GCC_PREPROCESSOR_DEFINITIONS = (
"NDEBUG=1",
+ "EnforceAccessControl=0",
"USE_GLOBAL_STRUCT=0",
"$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)",
"MULTIPLEBYTECODESETS=1",
Modified: branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.macos32x86/glue.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426)
@@ -27,7 +27,7 @@
73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; };
8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
- DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsnacspurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+ DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; };
DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; };
DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; };
Modified: branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/build.macos32x86/glue.stack.spur/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj 2015-08-20 19:28:03 UTC (rev 3426)
@@ -16,7 +16,7 @@
08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
7308DE360B9614A4003B7CCD /* UnixOSProcessPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = UnixOSProcessPlugin.c; path = ../../../nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c; sourceTree = "<group>"; };
73662FE60F53864E00C64E7F /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = Cross/vm/sqMemoryAccess.h; sourceTree = "<group>"; };
- 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsnacspurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
+ 73662FE70F53864E00C64E7F /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../nsspurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
73662FE80F53864E00C64E7F /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "Mac OS/vm/config.h"; sourceTree = "<group>"; };
73662FE90F53864E00C64E7F /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "Mac OS/vm/sqConfig.h"; sourceTree = "<group>"; };
73662FEA0F53864E00C64E7F /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "Mac OS/vm/sqPlatformSpecific.h"; sourceTree = "<group>"; };
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-08-20 19:28:03 UTC (rev 3426)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1436 uuid: 9d2442c4-2066-4ffd-a215-e7e2b6cb8eed
+ CCodeGenerator VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
*/
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-08-20 19:28:03 UTC (rev 3426)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
from
- CoInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1253,7 +1253,6 @@
static usqInt totalBytesInSegments(void);
static sqInt writeImageSegmentsToFile(sqImageFile aBinaryStream) NoDbgRegParms;
static sqInt writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSegment, sqImageFile aBinaryStream) NoDbgRegParms;
-static sqInt accessModifierOfMethodHeader(sqInt header) NoDbgRegParms;
static sqInt accessModifierOfMethod(sqInt methodObj) NoDbgRegParms;
extern sqInt activeProcess(void);
static void addLastLinktoList(sqInt proc, sqInt aList) NoDbgRegParms;
@@ -2415,7 +2414,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1435";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1439";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -18329,7 +18328,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -20719,7 +20718,7 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found
- && ((accessModifierOfMethodHeader(methodHeaderOf(GIV(newMethod)))) != AccessModifierPrivate)) {
+ && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) {
return 0;
}
/* begin followField:ofObject: */
@@ -60458,7 +60457,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -65245,7 +65244,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -65584,22 +65583,6 @@
return nWritten;
}
-
-/* accessModifier bits:
- 00 public
- 01 private
- 10 protected
- 11 undefined */
-
- /* StackInterpreter>>#accessModifierOfMethodHeader: */
-static sqInt
-accessModifierOfMethodHeader(sqInt header)
-{
- return (EnforceAccessControl
- ? (((usqInt) header) >> MethodHeaderFlagBitPosition) & 3
- : AccessModifierPublic);
-}
-
/* StackInterpreter>>#accessModifierOfMethod: */
static sqInt
accessModifierOfMethod(sqInt methodObj)
@@ -71755,8 +71738,8 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found
- && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) {
- return rule;
+ && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) {
+ return 0;
}
/* begin followField:ofObject: */
objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-08-20 19:28:03 UTC (rev 3426)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-08-20 19:28:03 UTC (rev 3426)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
from
- CoInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1256,7 +1256,6 @@
static usqInt totalBytesInSegments(void);
static sqInt writeImageSegmentsToFile(sqImageFile aBinaryStream) NoDbgRegParms;
static sqInt writeSegmentnextSegmenttoFile(SpurSegmentInfo *segment, SpurSegmentInfo *nextSegment, sqImageFile aBinaryStream) NoDbgRegParms;
-static sqInt accessModifierOfMethodHeader(sqInt header) NoDbgRegParms;
static sqInt accessModifierOfMethod(sqInt methodObj) NoDbgRegParms;
extern sqInt activeProcess(void);
static void addLastLinktoList(sqInt proc, sqInt aList) NoDbgRegParms;
@@ -2418,7 +2417,7 @@
/*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1
};
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1435";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1439";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -18338,7 +18337,7 @@
static sqInt
checkForAndFollowForwardedPrimitiveState(void)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- signed char accessorDepth;
+ sqInt accessorDepth;
sqInt firstBytecode;
sqInt found;
sqInt found1;
@@ -20728,7 +20727,7 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found
- && ((accessModifierOfMethodHeader(methodHeaderOf(GIV(newMethod)))) != AccessModifierPrivate)) {
+ && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) {
return 0;
}
/* begin followField:ofObject: */
@@ -60467,7 +60466,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- sqInt prevPrevFreeChunk;
+ usqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -65254,7 +65253,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -65593,22 +65592,6 @@
return nWritten;
}
-
-/* accessModifier bits:
- 00 public
- 01 private
- 10 protected
- 11 undefined */
-
- /* StackInterpreter>>#accessModifierOfMethodHeader: */
-static sqInt
-accessModifierOfMethodHeader(sqInt header)
-{
- return (EnforceAccessControl
- ? (((usqInt) header) >> MethodHeaderFlagBitPosition) & 3
- : AccessModifierPublic);
-}
-
/* StackInterpreter>>#accessModifierOfMethod: */
static sqInt
accessModifierOfMethod(sqInt methodObj)
@@ -71764,8 +71747,8 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found
- && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) {
- return rule;
+ && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) {
+ return 0;
}
/* begin followField:ofObject: */
objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-08-20 19:28:03 UTC (rev 3426)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
from
- StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -209,7 +209,7 @@
#define EnclosingObjectIndex 4
#define EndOfRun 0x101
#if !defined(EnforceAccessControl) /* Allow EnforceAccessControl to be overridden on the compiler command line */
-# define EnforceAccessControl 0
+# define EnforceAccessControl 1
#endif
#define EphemeronQueueRootIndex 4098
#define ExcessSignalsIndex 2
@@ -2177,7 +2177,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1435";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -61418,8 +61418,8 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found
- && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) {
- return rule;
+ && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) {
+ return 0;
}
/* begin followField:ofObject: */
objOop1 = longAt((lookupClass + BaseHeaderSize) + (((long)SuperclassIndex) << (shiftForWord())));
Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/nsspurstack64src/vm/interp.c 2015-08-20 19:28:03 UTC (rev 3426)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
from
- StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -206,7 +206,7 @@
#define EnclosingObjectIndex 4
#define EndOfRun 0x101
#if !defined(EnforceAccessControl) /* Allow EnforceAccessControl to be overridden on the compiler command line */
-# define EnforceAccessControl 0
+# define EnforceAccessControl 1
#endif
#define EphemeronQueueRootIndex 4098
#define ExcessSignalsIndex 2
@@ -2174,7 +2174,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1435";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -61409,8 +61409,8 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found
- && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) {
- return rule;
+ && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) {
+ return 0;
}
/* begin followField:ofObject: */
objOop1 = longAt((lookupClass + BaseHeaderSize) + (((long)SuperclassIndex) << (shiftForWord())));
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-08-20 19:28:03 UTC (rev 3426)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
from
- StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2148,7 +2148,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1435";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -56843,8 +56843,8 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found
- && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) {
- return rule;
+ && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) {
+ return 0;
}
/* begin followField:ofObject: */
objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-19 23:57:42 UTC (rev 3425)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-08-20 19:28:03 UTC (rev 3426)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
from
- StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4
+ StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1435 uuid: 114c4214-dede-4f25-9bbb-c912623d0ef4 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1439 uuid: ce1fb6f7-90ee-48c4-9f60-6ff1731ec464 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2145,7 +2145,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1435";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1439";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -56834,8 +56834,8 @@
found = 0;
l1: /* end lookupMethodInDictionary: */;
if (found
- && ((accessModifierOfMethod(GIV(newMethod))) != AccessModifierPrivate)) {
- return rule;
+ && (!((accessModifierOfMethod(GIV(newMethod))) == AccessModifierPrivate))) {
+ return 0;
}
/* begin followField:ofObject: */
objOop1 = longAt((lookupClass + BaseHeaderSize) + (SuperclassIndex << (shiftForWord())));
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Wed Aug 19 16:54:51 PDT 2015
+ Thu Aug 20 12:26:45 PDT 2015
More information about the Vm-dev
mailing list