[Vm-dev] [commit][3435] CogVM source as per VMMaker.oscog-eem.1451
commits at squeakvm.org
commits at squeakvm.org
Mon Sep 14 23:00:43 UTC 2015
Revision: 3435
Author: eliot
Date: 2015-09-14 16:00:42 -0700 (Mon, 14 Sep 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1451
Oops! The has hash arm of primitiveSetOrHasIdentityHash needs to return, not
fall through.
Fix a typo in the Matrix2x3Plugin (thanks Nicolai).
Modified Paths:
--------------
branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
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
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
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
branches/Cog/spurstack64src/vm/gcc3x-interp.c
branches/Cog/spurstack64src/vm/interp.c
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Added Paths:
-----------
branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/
branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/
branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/Info.plist
branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/makeit
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Property changes on: branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin
___________________________________________________________________
Added: svn:ignore
+ build
Added: branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj (rev 0)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/BochsX64Plugin.xcodeproj/project.pbxproj 2015-09-14 23:00:42 UTC (rev 3435)
@@ -0,0 +1,277 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 42;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 73020E8D0EE714E60021D217 /* BochsX64Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* BochsX64Plugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/BochsX64Plugin -I\"../../../platforms/Mac OS/vm\" -I../../../spursrc/vm"; }; };
+ 737482B30EE7339F004E10F8 /* libcpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libcpu.a */; };
+ 737482B50EE733BD004E10F8 /* libfpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libfpu.a */; };
+ 737482B70EE7343B004E10F8 /* sqBochsX64Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqBochsX64Plugin.cpp */; settings = {COMPILER_FLAGS = "-I../../bochsx64 -I../../../processors/IA32/bochs -I../../../processors/IA32/bochs/instrument/stubs"; }; };
+ 737483080EE7406A004E10F8 /* libdisasm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737483070EE7406A004E10F8 /* libdisasm.a */; };
+ 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+ 73020E8C0EE714E60021D217 /* BochsX64Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = BochsX64Plugin.c; path = ../../../src/plugins/BochsX64Plugin/BochsX64Plugin.c; sourceTree = SOURCE_ROOT; };
+ 73020E8E0EE7158C0021D217 /* BochsX64Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BochsX64Plugin.h; path = ../../../platforms/Cross/plugins/BochsX64Plugin/BochsX64Plugin.h; sourceTree = SOURCE_ROOT; };
+ 737482B20EE7339F004E10F8 /* libcpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcpu.a; path = ../../bochsx86/cpu/libcpu.a; sourceTree = SOURCE_ROOT; };
+ 737482B40EE733BD004E10F8 /* libfpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfpu.a; path = ../../bochsx86/fpu/libfpu.a; sourceTree = SOURCE_ROOT; };
+ 737482B60EE7343B004E10F8 /* sqBochsX64Plugin.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = sqBochsX64Plugin.cpp; path = ../../../platforms/Cross/plugins/BochsX64Plugin/sqBochsX64Plugin.cpp; sourceTree = SOURCE_ROOT; };
+ 737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../bochsx86/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; };
+ 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+ 8D01CCD20486CAD60068D4B7 /* BochsX64Plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BochsX64Plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+ DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/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; };
+ DA3A20F90AA63D000050B983 /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqConfig.h; path = "../../../platforms/Mac OS/vm/sqConfig.h"; sourceTree = SOURCE_ROOT; };
+ DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = "../../../platforms/Mac OS/vm/sqPlatformSpecific.h"; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 8D01CCCD0486CAD60068D4B7 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */,
+ 737482B30EE7339F004E10F8 /* libcpu.a in Frameworks */,
+ 737482B50EE733BD004E10F8 /* libfpu.a in Frameworks */,
+ 737483080EE7406A004E10F8 /* libdisasm.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 089C166AFE841209C02AAC07 /* BochsX64Plugin */ = {
+ isa = PBXGroup;
+ children = (
+ 737482B20EE7339F004E10F8 /* libcpu.a */,
+ 737482B40EE733BD004E10F8 /* libfpu.a */,
+ 737483070EE7406A004E10F8 /* libdisasm.a */,
+ 08FB77ADFE841716C02AAC07 /* Source */,
+ 089C167CFE841241C02AAC07 /* Resources */,
+ 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+ 19C28FB4FE9D528D11CA2CBB /* Products */,
+ );
+ name = BochsX64Plugin;
+ sourceTree = "<group>";
+ };
+ 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
+ isa = PBXGroup;
+ children = (
+ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */,
+ );
+ name = "External Frameworks and Libraries";
+ sourceTree = "<group>";
+ };
+ 089C167CFE841241C02AAC07 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ 8D01CCD10486CAD60068D4B7 /* Info.plist */,
+ );
+ name = Resources;
+ sourceTree = "<group>";
+ };
+ 08FB77ADFE841716C02AAC07 /* Source */ = {
+ isa = PBXGroup;
+ children = (
+ 737482B60EE7343B004E10F8 /* sqBochsX64Plugin.cpp */,
+ 73020E8E0EE7158C0021D217 /* BochsX64Plugin.h */,
+ 73020E8C0EE714E60021D217 /* BochsX64Plugin.c */,
+ DA3A20F80AA63D000050B983 /* config.h */,
+ DA3A20F90AA63D000050B983 /* sqConfig.h */,
+ DA3A20FA0AA63D000050B983 /* sqPlatformSpecific.h */,
+ DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */,
+ DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */,
+ DA3A20F50AA63CBF0050B983 /* interp.h */,
+ );
+ name = Source;
+ sourceTree = "<group>";
+ };
+ 19C28FB4FE9D528D11CA2CBB /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 8D01CCD20486CAD60068D4B7 /* BochsX64Plugin.bundle */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 8D01CCC60486CAD60068D4B7 /* BochsX64Plugin */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "BochsX64Plugin" */;
+ buildPhases = (
+ 8D01CCC90486CAD60068D4B7 /* Resources */,
+ 8D01CCCB0486CAD60068D4B7 /* Sources */,
+ 8D01CCCD0486CAD60068D4B7 /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = BochsX64Plugin;
+ productInstallPath = "$(HOME)/Library/Bundles";
+ productName = BochsX64Plugin;
+ productReference = 8D01CCD20486CAD60068D4B7 /* BochsX64Plugin.bundle */;
+ productType = "com.apple.product-type.bundle";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 089C1669FE841209C02AAC07 /* Project object */ = {
+ isa = PBXProject;
+ buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "BochsX64Plugin" */;
+ compatibilityVersion = "Xcode 2.4";
+ hasScannedForEncodings = 1;
+ mainGroup = 089C166AFE841209C02AAC07 /* BochsX64Plugin */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 8D01CCC60486CAD60068D4B7 /* BochsX64Plugin */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+ 8D01CCC90486CAD60068D4B7 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 8D01CCCB0486CAD60068D4B7 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 73020E8D0EE714E60021D217 /* BochsX64Plugin.c in Sources */,
+ 737482B70EE7343B004E10F8 /* sqBochsX64Plugin.cpp in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ 4FADC23408B4156C00ABE55E /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = NO;
+ INFOPLIST_FILE = Info.plist;
+ INSTALL_PATH = "$(HOME)/Library/Bundles";
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
+ );
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../bochsx86/cpu\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../bochsx86/fpu\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../bochsx86/disasm\"";
+ PRODUCT_NAME = BochsX64Plugin;
+ WRAPPER_EXTENSION = bundle;
+ ZERO_LINK = YES;
+ };
+ name = Debug;
+ };
+ 4FADC23508B4156C00ABE55E /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = i386;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = NO;
+ INFOPLIST_FILE = Info.plist;
+ INSTALL_PATH = "$(HOME)/Library/Bundles";
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
+ );
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../bochsx86/cpu\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../bochsx86/fpu\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../bochsx86/disasm\"";
+ PRODUCT_NAME = BochsX64Plugin;
+ WRAPPER_EXTENSION = bundle;
+ };
+ name = Release;
+ };
+ 4FADC23808B4156C00ABE55E /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
+ CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
+ COPY_PHASE_STRIP = NO;
+ GCC_MODEL_TUNING = "";
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+ PREBINDING = NO;
+ PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
+ SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+ STRIP_INSTALLED_PRODUCT = NO;
+ USER_HEADER_SEARCH_PATHS = "";
+ USE_HEADERMAP = NO;
+ };
+ name = Debug;
+ };
+ 4FADC23908B4156C00ABE55E /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = YES;
+ CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
+ CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
+ COPY_PHASE_STRIP = NO;
+ GCC_MODEL_TUNING = "";
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+ PREBINDING = NO;
+ PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
+ SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+ USER_HEADER_SEARCH_PATHS = "";
+ USE_HEADERMAP = NO;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "BochsX64Plugin" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 4FADC23408B4156C00ABE55E /* Debug */,
+ 4FADC23508B4156C00ABE55E /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "BochsX64Plugin" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 4FADC23808B4156C00ABE55E /* Debug */,
+ 4FADC23908B4156C00ABE55E /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 089C1669FE841209C02AAC07 /* Project object */;
+}
Added: branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/Info.plist
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/Info.plist (rev 0)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/Info.plist 2015-09-14 23:00:42 UTC (rev 3435)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>BochsX64Plugin</string>
+ <key>CFBundleIconFile</key>
+ <string>SqueakPlugin.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.squeak.BochsX64Plugin</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>BNDL</string>
+ <key>CFBundleSignature</key>
+ <string>FAST</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CSResourcesFileMapped</key>
+ <true/>
+</dict>
+</plist>
Added: branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/makeit
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/makeit (rev 0)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/makeit 2015-09-14 23:00:42 UTC (rev 3435)
@@ -0,0 +1,19 @@
+clear
+xcodebuild -configuration Debug -project BochsX64Plugin.xcodeproj
+xcodebuild -configuration Release -project BochsX64Plugin.xcodeproj
+for d in Assert.app Debug.app
+do
+ if [ -d "../$d" ]; then
+ echo installed Debug BochsX64Plugin in ../$d
+ rm -rf "../$d/Contents/Resources/BochsX64Plugin.bundle"
+ cp -R build/Debug/BochsX64Plugin.bundle "../$d/Contents/Resources"
+ fi
+done
+for d in Fast.app Croquet.app Squeak.app
+do
+ if [ -d "../$d" ]; then
+ echo installed Release BochsX64Plugin in ../$d
+ rm -rf "../$d/Contents/Resources/BochsX64Plugin.bundle"
+ cp -R build/Release/BochsX64Plugin.bundle "../$d/Contents/Resources"
+ fi
+done
Property changes on: branches/Cog/build.macos32x86/squeak.cog.spur/BochsX64Plugin/makeit
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspursrc/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0
+ VMPluginCodeGenerator VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- Matrix2x3Plugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0
+ Matrix2x3Plugin VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.1325 uuid: a0bb0f7f-5e6e-48a7-bf73-fa5d135e06c0 " __DATE__ ;
+static char __buildInfo[] = "Matrix2x3Plugin VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
@@ -114,9 +114,9 @@
static double m23ResultY;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "Matrix2x3Plugin VMMaker.oscog-eem.1325 (i)"
+ "Matrix2x3Plugin VMMaker.oscog-eem.1451 (i)"
#else
- "Matrix2x3Plugin VMMaker.oscog-eem.1325 (e)"
+ "Matrix2x3Plugin VMMaker.oscog-eem.1451 (e)"
#endif
;
@@ -264,7 +264,7 @@
okayIntValue(sqInt value)
{
return (value >= (((double) (MinSmallInteger) )))
- && (m23ResultX <= (((double) (MaxSmallInteger) )));
+ && (value <= (((double) (MaxSmallInteger) )));
}
/* Matrix2x3Plugin>>#primitiveComposeMatrix */
@@ -383,7 +383,7 @@
goto l2;
}
if (!((m23ResultY >= (((double) (MinSmallInteger) )))
- && (m23ResultX <= (((double) (MaxSmallInteger) ))))) {
+ && (m23ResultY <= (((double) (MaxSmallInteger) ))))) {
primitiveFail();
goto l2;
}
@@ -581,7 +581,7 @@
goto l2;
}
if (!((m23ResultY >= (((double) (MinSmallInteger) )))
- && (m23ResultX <= (((double) (MaxSmallInteger) ))))) {
+ && (m23ResultY <= (((double) (MaxSmallInteger) ))))) {
primitiveFail();
goto l2;
}
@@ -706,7 +706,7 @@
return primitiveFail();
}
if (!((m23ResultY >= (((double) (MinSmallInteger) )))
- && (m23ResultX <= (((double) (MaxSmallInteger) ))))) {
+ && (m23ResultY <= (((double) (MaxSmallInteger) ))))) {
return primitiveFail();
}
popthenPush(nItemsToPop, makePointwithxValueyValue(((sqInt)m23ResultX), ((sqInt)m23ResultY)));
@@ -729,22 +729,22 @@
minX = x0 + 0.5;
if (!((minX >= (((double) (MinSmallInteger) )))
- && (m23ResultX <= (((double) (MaxSmallInteger) ))))) {
+ && (minX <= (((double) (MaxSmallInteger) ))))) {
return primitiveFail();
}
maxX = x1 + 0.5;
if (!((maxX >= (((double) (MinSmallInteger) )))
- && (m23ResultX <= (((double) (MaxSmallInteger) ))))) {
+ && (maxX <= (((double) (MaxSmallInteger) ))))) {
return primitiveFail();
}
minY = y0 + 0.5;
if (!((minY >= (((double) (MinSmallInteger) )))
- && (m23ResultX <= (((double) (MaxSmallInteger) ))))) {
+ && (minY <= (((double) (MaxSmallInteger) ))))) {
return primitiveFail();
}
maxY = y1 + 0.5;
if (!((maxY >= (((double) (MinSmallInteger) )))
- && (m23ResultX <= (((double) (MaxSmallInteger) ))))) {
+ && (maxY <= (((double) (MaxSmallInteger) ))))) {
return primitiveFail();
}
pushRemappableOop(dstOop);
Modified: branches/Cog/nsspursrc/vm/cogit.h
===================================================================
--- branches/Cog/nsspursrc/vm/cogit.h 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspursrc/vm/cogit.h 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGenerator VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
Modified: branches/Cog/nsspursrc/vm/cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspursrc/vm/cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2414,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.1449";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1451";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -40368,6 +40368,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -60576,7 +60577,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -65392,7 +65393,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -65496,7 +65497,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt bridge;
+ usqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
Modified: branches/Cog/nsspursrc/vm/cointerp.h
===================================================================
--- branches/Cog/nsspursrc/vm/cointerp.h 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspursrc/vm/cointerp.h 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2417,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.1449";
+const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1451";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -40377,6 +40377,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -60585,7 +60586,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -65401,7 +65402,7 @@
sqInt largeChild;
sqInt newEndOfMemory;
sqInt next;
- sqInt node;
+ usqInt node;
SpurSegmentInfo *seg;
sqInt smallChild;
sqInt treeNode;
@@ -65505,7 +65506,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt bridge;
+ usqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- StackInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2179,7 +2179,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1449";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1451";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -25686,6 +25686,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
Modified: branches/Cog/nsspurstack64src/vm/interp.c
===================================================================
--- branches/Cog/nsspurstack64src/vm/interp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspurstack64src/vm/interp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- StackInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2176,7 +2176,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1449";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1451";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -25677,6 +25677,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- StackInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2150,7 +2150,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1449";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1451";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -25238,6 +25238,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
Modified: branches/Cog/nsspurstacksrc/vm/interp.c
===================================================================
--- branches/Cog/nsspurstacksrc/vm/interp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- StackInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2147,7 +2147,7 @@
/* 575 */ (void (*)(void))0,
0 };
char expensiveAsserts = 0;
-const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1449";
+const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1451";
volatile int sendTrace;
sqInt suppressHeartbeatFlag;
@@ -25229,6 +25229,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Mon Sep 14 11:12:43 PDT 2015
+ Mon Sep 14 15:59:41 PDT 2015
Modified: branches/Cog/spursistasrc/vm/cogit.h
===================================================================
--- branches/Cog/spursistasrc/vm/cogit.h 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/spursistasrc/vm/cogit.h 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGenerator VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
Modified: branches/Cog/spursistasrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/spursistasrc/vm/cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2389,7 +2389,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.1449]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1451]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -5659,6 +5659,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l228;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5677,7 +5678,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- /* return self */
+ null;
l228: /* end baseFrameReturn */;
goto l227;
}
@@ -30942,7 +30943,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
+ s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -36588,7 +36589,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -36706,7 +36707,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -38924,6 +38925,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -42598,7 +42600,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -44732,7 +44734,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- sqInt freeChunk;
+ usqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -44771,7 +44773,7 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- sqInt smallObj;
+ usqInt smallObj;
sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
@@ -47713,7 +47715,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -52063,7 +52065,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- sqInt loadedObjectsArray;
+ usqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -62523,8 +62525,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- sqInt savedInHashes;
- sqInt savedOutHashes;
+ usqInt savedInHashes;
+ usqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -63000,7 +63002,7 @@
sqInt formatField;
sqInt len;
usqInt newObj;
- sqInt newString;
+ usqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -64271,7 +64273,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- usqInt pier2;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spursistasrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursistasrc/vm/cointerp.h 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/spursistasrc/vm/cointerp.h 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -2392,7 +2392,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.1449]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1451]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -5668,6 +5668,7 @@
GIV(framePointer) = localFP;
ceEnterCogCodePopReceiverReg();
+ null;
goto l228;
}
localIP = pointerForOop(longAt(localFP + FoxIFSavedIP));
@@ -5686,7 +5687,7 @@
/* begin fetchNextBytecode */
currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector);
- /* return self */
+ null;
l228: /* end baseFrameReturn */;
goto l227;
}
@@ -30951,7 +30952,7 @@
GIV(needGCFlag) = 1;
forceInterruptCheck();
}
- s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex);
+ s = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex)));
goto l1;
}
if (numSlots >= 0xFF) {
@@ -36597,7 +36598,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -36715,7 +36716,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -38933,6 +38934,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -42607,7 +42609,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -44741,7 +44743,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- sqInt freeChunk;
+ usqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -44780,7 +44782,7 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- sqInt smallObj;
+ usqInt smallObj;
sqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
@@ -47722,7 +47724,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -52072,7 +52074,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- sqInt loadedObjectsArray;
+ usqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -62532,8 +62534,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- sqInt savedInHashes;
- sqInt savedOutHashes;
+ usqInt savedInHashes;
+ usqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -63009,7 +63011,7 @@
sqInt formatField;
sqInt len;
usqInt newObj;
- sqInt newString;
+ usqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -64280,7 +64282,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- usqInt pier2;
+ sqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spursrc/vm/cogit.h
===================================================================
--- branches/Cog/spursrc/vm/cogit.h 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/spursrc/vm/cogit.h 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGenerator VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGenerator VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
Modified: branches/Cog/spursrc/vm/cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/cointerp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/spursrc/vm/cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,9 +1,9 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1187,7 +1187,7 @@
static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
extern void tenuringIncrementalGC(void);
@@ -2376,7 +2376,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.1449]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1451]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -25841,7 +25841,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- sqInt s;
+ usqInt s;
char *sp;
sqInt sz;
@@ -31527,7 +31527,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -31645,7 +31645,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -33863,6 +33863,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
integerPointer = longAt(GIV(stackPointer) + (0 * BytesPerWord));
@@ -37537,7 +37538,7 @@
sqInt fillValue;
sqInt hash;
usqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -39671,7 +39672,7 @@
sqInt entry;
sqInt expectedIndex;
sqInt expectedIndex1;
- sqInt freeChunk;
+ usqInt freeChunk;
sqInt i;
sqInt i1;
sqInt index;
@@ -39710,8 +39711,8 @@
sqInt ptr1;
sqInt ptr2;
sqInt slotBytes;
- sqInt smallObj;
- sqInt start;
+ usqInt smallObj;
+ usqInt start;
classIndex = (long32At(aClass + 4)) & 0x3FFFFF;
if (classIndex == 0) {
@@ -42652,7 +42653,7 @@
sqInt fmt;
sqInt hasYoung;
sqInt i;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
usqInt numSlots;
@@ -46994,7 +46995,7 @@
sqInt hash;
sqInt i;
sqInt iLimiT;
- sqInt loadedObjectsArray;
+ usqInt loadedObjectsArray;
sqInt mappedOop;
usqInt newObj;
usqInt numBytes;
@@ -54059,7 +54060,7 @@
usqInt prevFree;
usqInt prevFreeChunk;
usqInt prevPrevFree;
- usqInt prevPrevFreeChunk;
+ sqInt prevPrevFreeChunk;
sqInt slotBytes;
sqInt slotBytes1;
usqInt there;
@@ -57428,8 +57429,8 @@
sqInt prevPrevObj;
sqInt prevPrevObj1;
sqInt ptr;
- sqInt savedInHashes;
- sqInt savedOutHashes;
+ usqInt savedInHashes;
+ usqInt savedOutHashes;
sqInt segAddr;
sqInt segStart;
sqInt slotBytes;
@@ -57899,13 +57900,13 @@
or nil if out of memory. */
/* SpurMemoryManager>>#stringForCString: */
-sqInt
+usqInt
stringForCString(const char *aCString)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
sqInt formatField;
sqInt len;
usqInt newObj;
- sqInt newString;
+ usqInt newString;
usqInt numBytes;
sqInt numSlots;
@@ -58615,7 +58616,7 @@
bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil)
{
usqInt bridgeSpan;
- sqInt clifton;
+ usqInt clifton;
usqInt segEnd;
segEnd = ((aSegment->segSize)) + ((aSegment->segStart));
@@ -58960,7 +58961,7 @@
static sqInt
readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes)
{ DECL_MAYBE_SQ_GLOBAL_STRUCT
- sqInt bridge;
+ usqInt bridge;
usqInt bridgehead;
usqInt bridgeSpan;
sqInt bytesRead;
@@ -59176,7 +59177,7 @@
usqLong firstSavedBridgeWord;
sqInt nWritten;
usqInt pier1;
- sqInt pier2;
+ usqInt pier2;
usqLong secondSavedBridgeWord;
pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize);
Modified: branches/Cog/spursrc/vm/cointerp.h
===================================================================
--- branches/Cog/spursrc/vm/cointerp.h 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/spursrc/vm/cointerp.h 2015-09-14 23:00:42 UTC (rev 3435)
@@ -1,5 +1,5 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
@@ -251,7 +251,7 @@
extern sqInt splObj(sqInt index);
extern usqInt storeCheckBoundary(void);
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
extern void tenuringIncrementalGC(void);
extern sqInt topRemappableOop(void);
extern sqInt validFreeTree(void);
Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c
===================================================================
--- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-09-14 18:14:01 UTC (rev 3434)
+++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2015-09-14 23:00:42 UTC (rev 3435)
@@ -2,11 +2,11 @@
/* Automatically generated by
- CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
from
- CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26
+ CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890
*/
-static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1449 uuid: d4ac7710-be23-4445-8a3c-1d95713d5f26 " __DATE__ ;
+static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1451 uuid: 35560bfb-1823-47e2-a964-8906c9d43890 " __DATE__ ;
char *__interpBuildInfo = __buildInfo;
@@ -1190,7 +1190,7 @@
static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms;
extern sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
extern sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer);
-extern sqInt stringForCString(const char *aCString);
+extern usqInt stringForCString(const char *aCString);
static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms;
static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms;
extern void tenuringIncrementalGC(void);
@@ -2379,7 +2379,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.1449]";
+const char *interpreterVersion = "Croquet Closure Cog[Spur] VM [CoInterpreterPrimitives VMMaker.oscog-eem.1451]";
sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */;
volatile int sendTrace;
@@ -25850,7 +25850,7 @@
usqInt newObj;
usqInt numBytes;
sqInt numSlots;
- sqInt s;
+ usqInt s;
char *sp;
sqInt sz;
@@ -31536,7 +31536,7 @@
sqInt err;
sqInt hash;
sqInt instSpec;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -31654,7 +31654,7 @@
sqInt i;
usqInt instSpec;
sqInt literalCount;
- sqInt newObj;
+ usqInt newObj;
usqInt newObj1;
usqInt numBytes;
sqInt numSlots;
@@ -33872,6 +33872,7 @@
? GIV(trueObj)
: GIV(falseObj)));
GIV(stackPointer) = sp;
+ return;
}
/* begin stackIntegerValue: */
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list