[Vm-dev] [commit][3297] CogVM source as per VMMaker.oscog-eem.1147
commits at squeakvm.org
commits at squeakvm.org
Wed Apr 1 22:16:05 UTC 2015
Revision: 3297
Author: eliot
Date: 2015-04-01 15:16:03 -0700 (Wed, 01 Apr 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1147
Retract the decision to type the results of the bitwise
operators as unsigned; it breaks at least the BitBlt plugin.
Integrate primitiveIsBigEnder & Nicolas' fix for safer
primitiveAdoptInstance & primitiveScanCharacters
Refactor send generation to take the send table to use
as an argument. rename sendTable to ordinarySendTable.
Mark relevant feature test methods in CogAbstractInstruction as <inline: true>.
Rename executeCogMethod:... to executeCogPIC:...
Spur: Make sure that all stacked values are followed in CoInterpreter>>
makeBaseFrameFor: for stale self refs in super sends. Make sure the stack is
scanned after a pin operation that involves forwarding. Make sure that the
unforwarding stack scan post-become (or post-pin) scans all of the stack
contents in the CoInterpreter, since super sends have no read barrier.
Newspeak:
Add Ryan's new self-send bytecodes. Use NSSendCache for IRC representation.
Modified Paths:
--------------
branches/Cog/build.macos32x86/squeak.sista.spur/makevm
branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c
branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c
branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/nsspursrc/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/nsspursrc/vm/cogit.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/nsspurstacksrc/vm/gcc3x-interp.c
branches/Cog/nsspurstacksrc/vm/interp.c
branches/Cog/scripts/findUnofficialFiles
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/cogit.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.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/ADPCMCodecPlugin/ADPCMCodecPlugin.c
branches/Cog/src/plugins/AioPlugin/AioPlugin.c
branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c
branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c
branches/Cog/src/plugins/FilePlugin/FilePlugin.c
branches/Cog/src/plugins/GeniePlugin/GeniePlugin.c
branches/Cog/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c
branches/Cog/src/plugins/MIDIPlugin/MIDIPlugin.c
branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
branches/Cog/src/plugins/ScratchPlugin/ScratchPlugin.c
branches/Cog/src/plugins/SocketPlugin/SocketPlugin.c
branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c
branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c
branches/Cog/src/plugins/ZipPlugin/ZipPlugin.c
branches/Cog/src/vm/cogit.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.sista.spur/BochsIA32Plugin/
branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit
branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/
branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit
Removed Paths:
-------------
branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit
branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit
branches/Cog/nscogbuild/
branches/Cog/nscogsrc/
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Deleted: branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/makeit 2015-03-26 04:04:13 UTC (rev 3292)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit 2015-04-01 22:16:03 UTC (rev 3297)
@@ -1,19 +0,0 @@
-clear
-xcodebuild -configuration Debug -project BochsIA32Plugin.xcodeproj
-xcodebuild -configuration Release -project BochsIA32Plugin.xcodeproj
-for d in Assert.app Debug.app
-do
- if [ -d "../$d" ]; then
- echo installed Debug BochsIA32Plugin in ../$d
- rm -rf "../$d/Contents/Resources/BochsIA32Plugin.bundle"
- cp -R build/Debug/BochsIA32Plugin.bundle "../$d/Contents/Resources"
- fi
-done
-for d in Fast.app Croquet.app
-do
- if [ -d "../$d" ]; then
- echo installed Release BochsIA32Plugin in ../$d
- rm -rf "../$d/Contents/Resources/BochsIA32Plugin.bundle"
- cp -R build/Release/BochsIA32Plugin.bundle "../$d/Contents/Resources"
- fi
-done
Copied: branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit (from rev 3294, branches/Cog/build.macos32x86/squeak.cog.spur/BochsIA32Plugin/makeit)
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit (rev 0)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/BochsIA32Plugin/makeit 2015-04-01 22:16:03 UTC (rev 3297)
@@ -0,0 +1,19 @@
+clear
+xcodebuild -configuration Debug -project BochsIA32Plugin.xcodeproj
+xcodebuild -configuration Release -project BochsIA32Plugin.xcodeproj
+for d in Assert.app Debug.app
+do
+ if [ -d "../$d" ]; then
+ echo installed Debug BochsIA32Plugin in ../$d
+ rm -rf "../$d/Contents/Resources/BochsIA32Plugin.bundle"
+ cp -R build/Debug/BochsIA32Plugin.bundle "../$d/Contents/Resources"
+ fi
+done
+for d in Fast.app Croquet.app Squeak.app
+do
+ if [ -d "../$d" ]; then
+ echo installed Release BochsIA32Plugin in ../$d
+ rm -rf "../$d/Contents/Resources/BochsIA32Plugin.bundle"
+ cp -R build/Release/BochsIA32Plugin.bundle "../$d/Contents/Resources"
+ fi
+done
Deleted: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj 2015-03-26 04:04:13 UTC (rev 3292)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj 2015-04-01 22:16:03 UTC (rev 3297)
@@ -1,304 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 42;
- objects = {
-
-/* Begin PBXBuildFile section */
- 73020E8D0EE714E60021D217 /* GdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* GdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/GdbARMPlugin -I\"../../../platforms/Mac OS/vm\" -I../../../spursrc/vm"; }; };
- 732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 732787F51AB7A40100BE5008 /* libiberty.a */; };
- 732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73ADAA901AB79ED50085DAA8 /* libbfd.a */; };
- 732788241AB7C73500BE5008 /* environ.c in Sources */ = {isa = PBXBuildFile; fileRef = 732787F11AB7A12A00BE5008 /* environ.c */; };
- 737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libopcodes.a */; };
- 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libsim.a */; };
- 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.6/include -I../../../processors/ARM/mac/gdb-7.6/sim/arm -I../../../processors/ARM/mac/gdb-7.6/bfd"; }; };
- 73F560891AB76408009B44A3 /* armulmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 73F560881AB76408009B44A3 /* armulmem.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.6/include -I../../../processors/ARM/mac/gdb-7.6/sim/arm -I../../../processors/ARM/mac/gdb-7.6/bfd"; }; };
- 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 /* GdbARMPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = GdbARMPlugin.c; path = ../../../src/plugins/GdbARMPlugin/GdbARMPlugin.c; sourceTree = SOURCE_ROOT; };
- 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GdbARMPlugin.h; path = ../../../platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h; sourceTree = SOURCE_ROOT; };
- 732787F11AB7A12A00BE5008 /* environ.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = environ.c; path = "../../../platforms/Mac OS/plugins/GdbARMPlugin/environ.c"; sourceTree = SOURCE_ROOT; };
- 732787F51AB7A40100BE5008 /* libiberty.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiberty.a; path = "../../../processors/ARM/mac/binutils-2.25/libiberty/libiberty.a"; sourceTree = SOURCE_ROOT; };
- 737482B20EE7339F004E10F8 /* libopcodes.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopcodes.a; path = "../../../processors/ARM/mac/gdb-7.6/opcodes/libopcodes.a"; sourceTree = SOURCE_ROOT; };
- 737482B40EE733BD004E10F8 /* libsim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsim.a; path = "../../../processors/ARM/mac/gdb-7.6/sim/arm/libsim.a"; sourceTree = SOURCE_ROOT; };
- 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = sqGdbARMPlugin.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c; sourceTree = SOURCE_ROOT; };
- 73ADAA901AB79ED50085DAA8 /* libbfd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbfd.a; path = "../../../processors/ARM/mac/binutils-2.25/bfd/libbfd.a"; sourceTree = SOURCE_ROOT; };
- 73F560881AB76408009B44A3 /* armulmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = armulmem.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/armulmem.c; sourceTree = SOURCE_ROOT; };
- 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
- 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GdbARMPlugin.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 /* libopcodes.a in Frameworks */,
- 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */,
- 732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */,
- 732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 089C166AFE841209C02AAC07 /* GdbARMPlugin */ = {
- isa = PBXGroup;
- children = (
- 737482B20EE7339F004E10F8 /* libopcodes.a */,
- 73ADAA901AB79ED50085DAA8 /* libbfd.a */,
- 737482B40EE733BD004E10F8 /* libsim.a */,
- 08FB77ADFE841716C02AAC07 /* Source */,
- 089C167CFE841241C02AAC07 /* Resources */,
- 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
- 19C28FB4FE9D528D11CA2CBB /* Products */,
- );
- name = GdbARMPlugin;
- 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 /* sqGdbARMPlugin.c */,
- 73F560881AB76408009B44A3 /* armulmem.c */,
- 732787F51AB7A40100BE5008 /* libiberty.a */,
- 732787F11AB7A12A00BE5008 /* environ.c */,
- 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */,
- 73020E8C0EE714E60021D217 /* GdbARMPlugin.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 /* GdbARMPlugin.bundle */,
- );
- name = Products;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 8D01CCC60486CAD60068D4B7 /* GdbARMPlugin */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "GdbARMPlugin" */;
- buildPhases = (
- 8D01CCC90486CAD60068D4B7 /* Resources */,
- 8D01CCCB0486CAD60068D4B7 /* Sources */,
- 8D01CCCD0486CAD60068D4B7 /* Frameworks */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = GdbARMPlugin;
- productInstallPath = "$(HOME)/Library/Bundles";
- productName = GdbARMPlugin;
- productReference = 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.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 "GdbARMPlugin" */;
- compatibilityVersion = "Xcode 2.4";
- developmentRegion = English;
- hasScannedForEncodings = 1;
- knownRegions = (
- English,
- Japanese,
- French,
- German,
- );
- mainGroup = 089C166AFE841209C02AAC07 /* GdbARMPlugin */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 8D01CCC60486CAD60068D4B7 /* GdbARMPlugin */,
- );
- };
-/* 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 /* GdbARMPlugin.c in Sources */,
- 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */,
- 73F560891AB76408009B44A3 /* armulmem.c in Sources */,
- 732788241AB7C73500BE5008 /* environ.c 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_4)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
- );
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
- PRODUCT_NAME = GdbARMPlugin;
- 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_4)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
- );
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\"";
- LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
- PRODUCT_NAME = GdbARMPlugin;
- 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.6.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.6.sdk;
- USER_HEADER_SEARCH_PATHS = "";
- USE_HEADERMAP = NO;
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "GdbARMPlugin" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 4FADC23408B4156C00ABE55E /* Debug */,
- 4FADC23508B4156C00ABE55E /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "GdbARMPlugin" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 4FADC23808B4156C00ABE55E /* Debug */,
- 4FADC23908B4156C00ABE55E /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 089C1669FE841209C02AAC07 /* Project object */;
-}
Copied: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj (from rev 3293, branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj)
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj (rev 0)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj 2015-04-01 22:16:03 UTC (rev 3297)
@@ -0,0 +1,300 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 42;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 73020E8D0EE714E60021D217 /* GdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* GdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../platforms/Cross/vm -I../../../platforms/Cross/plugins/GdbARMPlugin -I\"../../../platforms/Mac OS/vm\" -I../../../spursrc/vm"; }; };
+ 732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 732787F51AB7A40100BE5008 /* libiberty.a */; };
+ 732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73ADAA901AB79ED50085DAA8 /* libbfd.a */; };
+ 732788241AB7C73500BE5008 /* environ.c in Sources */ = {isa = PBXBuildFile; fileRef = 732787F11AB7A12A00BE5008 /* environ.c */; };
+ 737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libopcodes.a */; };
+ 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libsim.a */; };
+ 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.6/include -I../../../processors/ARM/mac/gdb-7.6/sim/arm -I../../../processors/ARM/mac/gdb-7.6/bfd"; }; };
+ 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 /* GdbARMPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = GdbARMPlugin.c; path = ../../../src/plugins/GdbARMPlugin/GdbARMPlugin.c; sourceTree = SOURCE_ROOT; };
+ 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GdbARMPlugin.h; path = ../../../platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h; sourceTree = SOURCE_ROOT; };
+ 732787F11AB7A12A00BE5008 /* environ.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = environ.c; path = "../../../platforms/Mac OS/plugins/GdbARMPlugin/environ.c"; sourceTree = SOURCE_ROOT; };
+ 732787F51AB7A40100BE5008 /* libiberty.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiberty.a; path = "../../../processors/ARM/mac/binutils-2.25/libiberty/libiberty.a"; sourceTree = SOURCE_ROOT; };
+ 737482B20EE7339F004E10F8 /* libopcodes.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopcodes.a; path = "../../../processors/ARM/mac/gdb-7.6/opcodes/libopcodes.a"; sourceTree = SOURCE_ROOT; };
+ 737482B40EE733BD004E10F8 /* libsim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsim.a; path = "../../../processors/ARM/mac/gdb-7.6/sim/arm/libsim.a"; sourceTree = SOURCE_ROOT; };
+ 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = sqGdbARMPlugin.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c; sourceTree = SOURCE_ROOT; };
+ 73ADAA901AB79ED50085DAA8 /* libbfd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbfd.a; path = "../../../processors/ARM/mac/binutils-2.25/bfd/libbfd.a"; sourceTree = SOURCE_ROOT; };
+ 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+ 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GdbARMPlugin.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 /* libopcodes.a in Frameworks */,
+ 737482B50EE733BD004E10F8 /* libsim.a in Frameworks */,
+ 732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */,
+ 732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 089C166AFE841209C02AAC07 /* GdbARMPlugin */ = {
+ isa = PBXGroup;
+ children = (
+ 737482B20EE7339F004E10F8 /* libopcodes.a */,
+ 73ADAA901AB79ED50085DAA8 /* libbfd.a */,
+ 737482B40EE733BD004E10F8 /* libsim.a */,
+ 08FB77ADFE841716C02AAC07 /* Source */,
+ 089C167CFE841241C02AAC07 /* Resources */,
+ 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+ 19C28FB4FE9D528D11CA2CBB /* Products */,
+ );
+ name = GdbARMPlugin;
+ 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 /* sqGdbARMPlugin.c */,
+ 732787F51AB7A40100BE5008 /* libiberty.a */,
+ 732787F11AB7A12A00BE5008 /* environ.c */,
+ 73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */,
+ 73020E8C0EE714E60021D217 /* GdbARMPlugin.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 /* GdbARMPlugin.bundle */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+ 8D01CCC60486CAD60068D4B7 /* GdbARMPlugin */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "GdbARMPlugin" */;
+ buildPhases = (
+ 8D01CCC90486CAD60068D4B7 /* Resources */,
+ 8D01CCCB0486CAD60068D4B7 /* Sources */,
+ 8D01CCCD0486CAD60068D4B7 /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = GdbARMPlugin;
+ productInstallPath = "$(HOME)/Library/Bundles";
+ productName = GdbARMPlugin;
+ productReference = 8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.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 "GdbARMPlugin" */;
+ compatibilityVersion = "Xcode 2.4";
+ developmentRegion = English;
+ hasScannedForEncodings = 1;
+ knownRegions = (
+ English,
+ Japanese,
+ French,
+ German,
+ );
+ mainGroup = 089C166AFE841209C02AAC07 /* GdbARMPlugin */;
+ projectDirPath = "";
+ projectRoot = "";
+ targets = (
+ 8D01CCC60486CAD60068D4B7 /* GdbARMPlugin */,
+ );
+ };
+/* 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 /* GdbARMPlugin.c in Sources */,
+ 737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */,
+ 732788241AB7C73500BE5008 /* environ.c 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_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
+ );
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
+ PRODUCT_NAME = GdbARMPlugin;
+ 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_4)",
+ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
+ );
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\"";
+ LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
+ PRODUCT_NAME = GdbARMPlugin;
+ 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.6.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.6.sdk;
+ USER_HEADER_SEARCH_PATHS = "";
+ USE_HEADERMAP = NO;
+ };
+ name = Release;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "GdbARMPlugin" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 4FADC23408B4156C00ABE55E /* Debug */,
+ 4FADC23508B4156C00ABE55E /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+ 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "GdbARMPlugin" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 4FADC23808B4156C00ABE55E /* Debug */,
+ 4FADC23908B4156C00ABE55E /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 089C1669FE841209C02AAC07 /* Project object */;
+}
Deleted: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/makeit 2015-03-26 04:04:13 UTC (rev 3292)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit 2015-04-01 22:16:03 UTC (rev 3297)
@@ -1,19 +0,0 @@
-clear
-xcodebuild -configuration Debug -project GdbARMPlugin.xcodeproj
-xcodebuild -configuration Release -project GdbARMPlugin.xcodeproj
-for d in Assert.app Debug.app
-do
- if [ -d "../$d" ]; then
- echo installed Debug GdbARMPlugin in ../$d
- rm -rf "../$d/Contents/Resources/GdbARMPlugin.bundle"
- cp -R build/Debug/GdbARMPlugin.bundle "../$d/Contents/Resources"
- fi
-done
-for d in Fast.app Croquet.app
-do
- if [ -d "../$d" ]; then
- echo installed Release GdbARMPlugin in ../$d
- rm -rf "../$d/Contents/Resources/GdbARMPlugin.bundle"
- cp -R build/Release/GdbARMPlugin.bundle "../$d/Contents/Resources"
- fi
-done
Copied: branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit (from rev 3294, branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/makeit)
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit (rev 0)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/GdbARMPlugin/makeit 2015-04-01 22:16:03 UTC (rev 3297)
@@ -0,0 +1,19 @@
+clear
+xcodebuild -configuration Debug -project GdbARMPlugin.xcodeproj
+xcodebuild -configuration Release -project GdbARMPlugin.xcodeproj
+for d in Assert.app Debug.app
+do
+ if [ -d "../$d" ]; then
+ echo installed Debug GdbARMPlugin in ../$d
+ rm -rf "../$d/Contents/Resources/GdbARMPlugin.bundle"
+ cp -R build/Debug/GdbARMPlugin.bundle "../$d/Contents/Resources"
+ fi
+done
+for d in Fast.app Croquet.app Squeak.app
+do
+ if [ -d "../$d" ]; then
+ echo installed Release GdbARMPlugin in ../$d
+ rm -rf "../$d/Contents/Resources/GdbARMPlugin.bundle"
+ cp -R build/Release/GdbARMPlugin.bundle "../$d/Contents/Resources"
+ fi
+done
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/makevm
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2015-03-29 00:30:44 UTC (rev 3296)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2015-04-01 22:16:03 UTC (rev 3297)
@@ -113,7 +113,6 @@
rm -rf "$DEST/Contents/Resources/SqueakSSL.bundle"
cp -R SqueakSSL/build/$XCD_BUILD_CONFIGURATION/SqueakSSL.bundle "$DEST/Contents/Resources"
-if false; then
# Build the BochsIA32Plugin
# N.B. To build the plugin you also have to build the Bochs libraries in
# ../../processors/IA32/bochs. cd ../../processors/IA32/bochs. Run conf.COG & makeem.
@@ -121,6 +120,17 @@
xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project BochsIA32Plugin/BochsIA32Plugin.xcodeproj
rm -rf "$DEST/Contents/Resources/BochsIA32Plugin.bundle"
cp -R BochsIA32Plugin/build/$XCD_BUILD_CONFIGURATION/BochsIA32Plugin.bundle "$DEST/Contents/Resources"
+
+# Build the GdbARMPlugin
+# N.B. To build the plugin you also have to build the gdb ARM sim libraries in
+# ../../processors/ARM/mac.
+if test -f ../../processors/ARM/mac/gdb-7.6/opcodes/libopcodes.a; then
+echo GdbARMPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project GdbARMPlugin/GdbARMPlugin.xcodeproj
+xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project GdbARMPlugin/GdbARMPlugin.xcodeproj
+rm -rf "$DEST/Contents/Resources/GdbARMPlugin.bundle"
+cp -R GdbARMPlugin/build/$XCD_BUILD_CONFIGURATION/GdbARMPlugin.bundle "$DEST/Contents/Resources"
+else
+echo "not building GdbARMPlugin; support libraries unavailable"
fi
# Build the UnixOSProcessPlugin
Modified: branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
+++ branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c 2015-04-01 22:16:03 UTC (rev 3297)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.1080 uuid: 8b1a09b7-4f58-4375-b16a-e42e63ffd542
+ VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec
from
- UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0
+ UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f
*/
-static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 " __DATE__ ;
+static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.18 uuid: c426ab70-05a2-43a1-a899-e324aaf8f92f " __DATE__ ;
@@ -120,9 +120,9 @@
struct VirtualMachine* interpreterProxy;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (i)"
+ "AioPlugin VMConstruction-Plugins-AioPlugin-eem.18 (i)"
#else
- "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (e)"
+ "AioPlugin VMConstruction-Plugins-AioPlugin-eem.18 (e)"
#endif
;
@@ -256,7 +256,7 @@
sqSocketBytes = arrayValueOf(objectPointer);
idx = 0;
- while (idx < (socketRecordSize())) {
+ while (idx < (sizeof(SQSocket))) {
if ((sqSocketBytes[idx]) != 0) {
return 0;
}
@@ -291,7 +291,7 @@
isSQSocketObject(sqInt objectPointer)
{
return ((isBytes(objectPointer))
- && ((byteSizeOf(objectPointer)) == (socketRecordSize())))
+ && ((byteSizeOf(objectPointer)) == (sizeof(SQSocket))))
&& (!(isNullSQSocket(objectPointer)));
}
@@ -394,7 +394,7 @@
{
sqInt exceptionWatch;
sqInt fd;
- usqInt flags;
+ sqInt flags;
sqInt readWatch;
sqInt writeWatch;
@@ -440,7 +440,7 @@
{
sqInt exceptionWatch;
sqInt fd;
- usqInt flags;
+ sqInt flags;
sqInt readWatch;
sqInt writeWatch;
@@ -523,7 +523,7 @@
sqSocketOop = stackValue(0);
if (!(((isBytes(sqSocketOop))
- && ((byteSizeOf(sqSocketOop)) == (socketRecordSize())))
+ && ((byteSizeOf(sqSocketOop)) == (sizeof(SQSocket))))
&& (!(isNullSQSocket(sqSocketOop))))) {
return primitiveFail();
}
Modified: branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
+++ branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c 2015-04-01 22:16:03 UTC (rev 3297)
@@ -1,9 +1,9 @@
/* Automatically generated by
- VMPluginCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ VMPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec
from
- BalloonEnginePlugin VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ BalloonEnginePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec
*/
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ;
@@ -836,9 +836,9 @@
static void * loadBBFn;
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "B2DPlugin VMMaker.oscog-eem.1111 (i)"
+ "B2DPlugin VMMaker.oscog-eem.1145 (i)"
#else
- "B2DPlugin VMMaker.oscog-eem.1111 (e)"
+ "B2DPlugin VMMaker.oscog-eem.1145 (e)"
#endif
;
static int* objBuffer;
@@ -877,7 +877,7 @@
static sqInt
aaFirstPixelFromto(sqInt leftX, sqInt rightX)
{
- usqInt firstPixel;
+ sqInt firstPixel;
firstPixel = ((leftX + (workBuffer[GWAALevel])) - 1) & ((unsigned int)~((workBuffer[GWAALevel]) - 1));
if (firstPixel > rightX) {
@@ -952,8 +952,8 @@
static sqInt
absoluteSquared8Dot24(sqInt value)
{
- usqInt word1;
- usqInt word2;
+ sqInt word1;
+ sqInt word2;
word1 = value & 0xFFFF;
word2 = (((usqInt) value >> 16)) & 0xFF;
@@ -2819,7 +2819,7 @@
sqInt bmRaster1;
sqInt bmRaster2;
sqInt bmWidth;
- usqInt cMask;
+ sqInt cMask;
sqInt cMask1;
sqInt cMask2;
sqInt cMask3;
@@ -2832,7 +2832,7 @@
sqInt dtX;
sqInt fillValue;
sqInt firstPixel;
- usqInt firstPixel1;
+ sqInt firstPixel1;
sqInt g;
sqInt g1;
sqInt g2;
@@ -3505,9 +3505,9 @@
{
sqInt aaLevel;
sqInt baseShift;
- usqInt colorMask;
+ sqInt colorMask;
sqInt firstPixel;
- usqInt firstPixel1;
+ sqInt firstPixel1;
sqInt idx;
sqInt lastPixel;
sqInt pv32;
@@ -3635,11 +3635,11 @@
{
sqInt aaLevel;
sqInt baseShift;
- usqInt colorMask;
+ sqInt colorMask;
sqInt colorShift;
sqInt ds;
sqInt firstPixel;
- usqInt firstPixel1;
+ sqInt firstPixel1;
sqInt idx;
sqInt lastPixel;
sqInt rampIndex;
@@ -3969,12 +3969,12 @@
{
sqInt aaLevel;
sqInt baseShift;
- usqInt colorMask;
+ sqInt colorMask;
sqInt colorShift;
int ds;
int dt;
sqInt firstPixel;
- usqInt firstPixel1;
+ sqInt firstPixel1;
sqInt index;
sqInt lastPixel;
sqInt length2;
@@ -4368,7 +4368,7 @@
int ds;
int dt;
sqInt firstPixel;
- usqInt firstPixel1;
+ sqInt firstPixel1;
sqInt index;
sqInt lastLength;
sqInt lastPixel;
@@ -12279,8 +12279,8 @@
int *updateData1;
sqInt viaX;
sqInt viaY;
- usqInt word1;
- usqInt word2;
+ sqInt word1;
+ sqInt word2;
sqInt xValue;
@@ -13554,11 +13554,11 @@
static sqInt
transformColor(sqInt fillIndex)
{
- usqInt a;
+ sqInt a;
double alphaScale;
- usqInt b;
- usqInt g;
- usqInt r;
+ sqInt b;
+ sqInt g;
+ sqInt r;
float *transform;
if (!((fillIndex == 0)
@@ -13998,10 +13998,10 @@
static sqInt
uncheckedTransformColor(sqInt fillIndex)
{
- usqInt a;
- usqInt b;
- usqInt g;
- usqInt r;
+ sqInt a;
+ sqInt b;
+ sqInt g;
+ sqInt r;
float *transform;
if (!((workBuffer[GWHasColorTransform]) != 0)) {
Modified: branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-03-29 00:30:44 UTC (rev 3296)
+++ branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c 2015-04-01 22:16:03 UTC (rev 3297)
@@ -1,9 +1,9 @@
/* Automatically generated by
- SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec
from
- BitBltSimulation VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146
+ BitBltSimulation VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec
*/
-static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1111 uuid: d49aabf6-9652-4eaf-b08d-0ccddc9c9146 " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker.oscog-eem.1145 uuid: 945d0a43-e29d-4fb4-a1b8-263465636aec " __DATE__ ;
@@ -344,9 +344,9 @@
};
static const char *moduleName =
#ifdef SQUEAK_BUILTIN_PLUGIN
- "BitBltPlugin VMMaker.oscog-eem.1111 (i)"
+ "BitBltPlugin VMMaker.oscog-eem.1145 (i)"
#else
- "BitBltPlugin VMMaker.oscog-eem.1111 (e)"
+ "BitBltPlugin VMMaker.oscog-eem.1145 (e)"
#endif
;
static sqInt noHalftone;
@@ -439,7 +439,7 @@
alphaBlendConstwithpaintMode(unsigned int sourceWord, unsigned int destinationWord, sqInt paintMode)
{
sqInt bitsPerColor;
- usqInt blend;
+ sqInt blend;
unsigned int blendAG;
unsigned int blendRB;
unsigned int destPixVal;
@@ -447,7 +447,7 @@
sqInt i;
sqInt j;
sqInt maskShifted;
- usqInt pixBlend;
+ sqInt pixBlend;
int pixMask;
unsigned int result;
sqInt rgbMask;
@@ -626,8 +626,8 @@
sqInt deltaX;
sqInt deltaY;
sqInt destWord;
- usqInt ditherBase;
- usqInt ditherIndex;
+ sqInt ditherBase;
+ sqInt ditherIndex;
int ditherThreshold;
sqInt dstIndex;
sqInt dstMask;
@@ -637,7 +637,7 @@
sqInt sourceWord;
sqInt srcAlpha;
sqInt srcIndex;
- usqInt srcShift;
+ sqInt srcShift;
sqInt srcY;
@@ -873,18 +873,18 @@
static sqInt
alphaSourceBlendBits8(void)
{
- usqInt adjust;
+ sqInt adjust;
sqInt deltaX;
sqInt deltaY;
sqInt destWord;
sqInt dstIndex;
- usqInt dstMask;
+ sqInt dstMask;
sqInt dstValue;
sqInt dstY;
- usqInt mapperFlags;
+ sqInt mapperFlags;
unsigned int *mappingTable;
sqInt pv;
- usqInt sourceWord;
+ sqInt sourceWord;
sqInt srcAlpha;
sqInt srcIndex;
sqInt srcShift;
@@ -1356,12 +1356,12 @@
{
sqInt done;
sqInt dWid;
- usqInt dxLowBits;
- usqInt endBits;
+ sqInt dxLowBits;
+ sqInt endBits;
sqInt pixPerM1;
sqInt pixPerM11;
sqInt startBits;
- usqInt sxLowBits;
+ sqInt sxLowBits;
sqInt t;
copyBitsRule41Test();
@@ -1693,12 +1693,12 @@
{
sqInt done;
sqInt dWid;
- usqInt dxLowBits;
- usqInt endBits;
+ sqInt dxLowBits;
+ sqInt endBits;
sqInt pixPerM1;
sqInt pixPerM11;
sqInt startBits;
- usqInt sxLowBits;
+ sqInt sxLowBits;
sqInt t;
@@ -1996,7 +1996,7 @@
sqInt notSkewMask;
sqInt prevWord;
sqInt skewMask;
- usqInt skewWord;
+ sqInt skewWord;
sqInt thisWord;
sqInt unskew;
sqInt word;
@@ -2256,17 +2256,17 @@
unsigned int destPix;
int destPixMask;
sqInt destWord;
- usqInt destWord1;
- usqInt dstShift;
+ sqInt destWord1;
+ sqInt dstShift;
sqInt dstShift1;
sqInt dstShiftInc;
sqInt dstShiftLeft;
- usqInt endBits;
+ sqInt endBits;
sqInt halftoneWord;
sqInt i;
sqInt idx;
sqInt idx1;
- usqInt mapperFlags;
+ sqInt mapperFlags;
sqInt (*mergeFnwith)(sqInt, sqInt);
sqInt mergeWord;
sqInt nPix;
@@ -2275,10 +2275,10 @@
sqInt pv;
sqInt scrStartBits;
sqInt skewWord;
- usqInt sourcePix;
+ sqInt sourcePix;
int sourcePixMask;
sqInt sourceWord;
- usqInt srcShift;
+ sqInt srcShift;
sqInt srcShift1;
sqInt srcShiftInc;
sqInt startBits;
@@ -2562,7 +2562,7 @@
static sqInt
destMaskAndPointerInit(void)
{
- usqInt endBits;
+ sqInt endBits;
sqInt pixPerM1;
sqInt startBits;
@@ -2801,7 +2801,7 @@
expensiveDither32To16threshold(sqInt srcWord, sqInt ditherValue)
{
int out;
- usqInt pv;
+ sqInt pv;
int threshold;
int value;
@@ -3008,7 +3008,7 @@
{
sqInt b;
int out;
- usqInt pv;
+ sqInt pv;
sqInt t;
int threshold;
sqInt value;
@@ -3377,7 +3377,6 @@
cmSize = slotSizeOf(cmOop);
cmLookupTable = firstIndexableField(cmOop);
oldStyle = 1;
-
}
else {
@@ -3466,7 +3465,6 @@
else {
cmFlags = cmFlags | ColorMapFixedPart;
}
- null;
ok = 1;
l4: /* end loadColorMap */;
if (!ok) {
@@ -3649,7 +3647,6 @@
cmSize = slotSizeOf(cmOop);
cmLookupTable = firstIndexableField(cmOop);
oldStyle = 1;
-
}
else {
@@ -3735,7 +3732,6 @@
else {
cmFlags = cmFlags | ColorMapFixedPart;
}
- null;
return 1;
}
@@ -4005,7 +4001,7 @@
static sqInt
OLDrgbDiffwith(sqInt sourceWord, sqInt destinationWord)
{
- usqInt diff;
+ sqInt diff;
int pixMask;
if (destDepth < 16) {
@@ -4050,17 +4046,16 @@
sqInt d;
sqInt d1;
sqInt d2;
- usqInt destPix;
- usqInt destPix1;
- usqInt destPix2;
+ sqInt destPix;
+ sqInt destPix1;
+ sqInt destPix2;
sqInt i;
- usqInt mapIndex;
+ sqInt mapIndex;
sqInt mask;
sqInt mask3;
sqInt mask4;
- unsigned int pixMask;
+ int pixMask;
sqInt shiftWord;
- sqInt sourcePixel;
sqInt srcPix;
sqInt srcPix1;
sqInt srcPix2;
@@ -4086,7 +4081,6 @@
/* Two pixels Tally the right half... */
/* begin rgbMap:from:to: */
- sourcePixel = destinationWord & 0xFFFF;
if (((d = cmBitsPerColor - 5)) > 0) {
/* Expand to more bits by zero-fill */
@@ -4095,12 +4089,12 @@
/* Transfer mask */
mask = (1 << 5) - 1;
- srcPix = sourcePixel << d;
+ srcPix = (destinationWord & 0xFFFF) << d;
mask = mask << d;
destPix = srcPix & mask;
mask = mask << cmBitsPerColor;
srcPix = srcPix << d;
- mapIndex = ((sqInt) ((destPix + (srcPix & mask)) + ((srcPix << d) & (mask << cmBitsPerColor))));
+ mapIndex = (destPix + (srcPix & mask)) + ((srcPix << d) & (mask << cmBitsPerColor));
goto l1;
}
else {
@@ -4113,7 +4107,7 @@
/* Sometimes called with 16 bits, though pixel is 15,
but we must never return more than 15. */
- mapIndex = ((sqInt) (sourcePixel & 0x7FFF));
+ mapIndex = (destinationWord & 0xFFFF) & 0x7FFF;
goto l1;
}
if (5 == 8) {
@@ -4121,14 +4115,14 @@
/* Sometimes called with 32 bits, though pixel is 24,
but we must never return more than 24. */
- mapIndex = ((sqInt) (sourcePixel & 0xFFFFFF));
+ mapIndex = (destinationWord & 0xFFFF) & 0xFFFFFF;
goto l1;
}
- mapIndex = sourcePixel;
+ mapIndex = destinationWord & 0xFFFF;
goto l1;
}
- if (sourcePixel == 0) {
- mapIndex = sourcePixel;
+ if ((destinationWord & 0xFFFF) == 0) {
+ mapIndex = destinationWord & 0xFFFF;
goto l1;
}
d = 5 - cmBitsPerColor;
@@ -4136,7 +4130,7 @@
/* Transfer mask */
mask = (1 << cmBitsPerColor) - 1;
- srcPix = ((usqInt) sourcePixel) >> d;
+ srcPix = ((usqInt) (destinationWord & 0xFFFF)) >> d;
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list