Vm-dev November 2013

vm-dev@lists.squeakfoundation.org

30 participants
103 discussions

[commit][2796] Cog VM source as per VMMaker.oscog-eem.493.
by commits＠squeakvm.org 02 Nov '13

02 Nov '13

Revision: 2796 Author: eliot Date: 2013-11-01 19:56:58 -0700 (Fri, 01 Nov 2013) Log Message: ----------- Cog VM source as per VMMaker.oscog-eem.493. Functionality: Fix stack backtrace printing on Mac & Unix to not segfault when invoked from error(char *msg) function. Fix roomToPushNArgs:; the Cog VMs can be more lenient because of the use of a stack instead of contexts. Fixes some valueWithArguments: failures. Integrate Nice's improved SmallInteger generated primitives that support int x float comparison, & hence speed-up int x float comparison enormously. Integrate VMMaker-dtl.328 (failure of primitiveDisplayString to advance destX). Integrate 2792, fix memory leaks in SqueakSSL on unix. Integrate VMMaker-tpr.325 7247: BitBlt Bug in alphaSourceBlendBits8. Integrate VMMaker-tpr.326, Fix a single-bit constant error in BitBltSimulation>>copyBits:Fallback: - change 16r3FFF to 16r7FFF to correct tallyIntoMap behaviour for Scratch using BenBlt on the Pi. Restrict at-cache to bytecodePrimAt[Put], eliminating it from primitive[String]At[Put]. Sionara the explicit noAtCache at:[put:] machinery in CoInterpreter now that the atCache is confined to the interpreter's special selector at:[put:] bytecodes. Speeds up Stack VM signfiicantly, e.g. a compile of Compiler package falls from 1.6s to 1.4s on 2.2GHz Intel Core i7 MacBook Pro. Internals: Many cosmetic changes now VM mates to SpurMemoryManager as well as ObjectMemory. Add Spur-specific interpreter proxy functions for immediate character and pinning access (not available in ObjectMemory VMs). Restrict at-cache to bytecodePrimAt[Put], eliminating it from primitive[String] At[Put]. Undoes need for fix in VMMaker-oscog.44 of 7 January 2011: "Fix leaking of objects into the atCache due to ceSend:super:to:numArgs:'s use of executeNewMethod without always setting messageSelector." This renders messageSelector and lkupClass ephemeral, since they are live only during message lookup and because createActualMessageTo will not cause a GC these cannot change during message lookup. Hence eliminate them from markAndTraceInterpreterOops: & mapVMRegisters. Do not generate dead code by default. Fix off-by-one bug in findSelectorOfMethod:. Replace metaclassSizeBits with metaclassNumSlots. Fix printActivationNameFor:receiver:isBlock:firstTemporary: for anon methods. Fix bug in shortPrintFrameAndCallers: (filter-out base frames). Slang: only output VM_LABELs in interpret. Change mac Stack VM builds to define VM_LABEL as null in the debug VMs, restoring interpret's debuggability. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/platforms/Cross/vm/sq.h branches/Cog/platforms/Cross/vm/sqMemoryAccess.h branches/Cog/platforms/Cross/vm/sqVirtualMachine.c branches/Cog/platforms/Cross/vm/sqVirtualMachine.h branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/Mac OS/vm/sqMacMemory.c branches/Cog/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.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/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stackbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Added Paths: ----------- branches/Cog/spurstackbuild/ branches/Cog/spurstackbuild/cygwinbuild/ branches/Cog/spurstackbuild/cygwinbuild/Croquet.def.in branches/Cog/spurstackbuild/cygwinbuild/Croquet.ico branches/Cog/spurstackbuild/cygwinbuild/Croquet.rc branches/Cog/spurstackbuild/cygwinbuild/HowToBuild branches/Cog/spurstackbuild/cygwinbuild/Makefile branches/Cog/spurstackbuild/cygwinbuild/Makefile.plugin branches/Cog/spurstackbuild/cygwinbuild/Pharo.def.in branches/Cog/spurstackbuild/cygwinbuild/Pharo.ico branches/Cog/spurstackbuild/cygwinbuild/Pharo.rc branches/Cog/spurstackbuild/cygwinbuild/Squeak.def.in branches/Cog/spurstackbuild/cygwinbuild/Squeak.rc branches/Cog/spurstackbuild/cygwinbuild/mvm branches/Cog/spurstackbuild/cygwinbuild/plugins.ext branches/Cog/spurstackbuild/cygwinbuild/plugins.int branches/Cog/spurstackbuild/cygwinbuild/squeak.ico branches/Cog/spurstackbuild/macbuild/ branches/Cog/spurstackbuild/macbuild/CoreVM.plist branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/ branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/eliot.mode1v3 branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/eliot.pbxuser branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/johnmci.mode1 branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/johnmci.pbxuser branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/sophie.mode1 branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/sophie.pbxuser branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/temp branches/Cog/spurstackbuild/macbuild/CoreVM.xcodeproj/werdna.pbxuser branches/Cog/spurstackbuild/macbuild/CroquetPlugin/ branches/Cog/spurstackbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/ branches/Cog/spurstackbuild/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj branches/Cog/spurstackbuild/macbuild/CroquetPlugin/CroquetPlugin_Prefix.pch branches/Cog/spurstackbuild/macbuild/CroquetPlugin/English.lproj/ branches/Cog/spurstackbuild/macbuild/CroquetPlugin/English.lproj/InfoPlist.strings branches/Cog/spurstackbuild/macbuild/CroquetPlugin/Info.plist branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/ branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/English.lproj/ branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/English.lproj/InfoPlist.strings branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/ branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/FloatArrayPlugin_Prefix.pch branches/Cog/spurstackbuild/macbuild/FloatArrayPlugin/Info.plist branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/ branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/English.lproj/ branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/English.lproj/InfoPlist.strings branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/ branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/FloatMathPlugin_Prefix.pch branches/Cog/spurstackbuild/macbuild/FloatMathPlugin/Info.plist branches/Cog/spurstackbuild/macbuild/HowToBuild branches/Cog/spurstackbuild/macbuild/Mpeg3Plugin/ branches/Cog/spurstackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin-Info.plist branches/Cog/spurstackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/ branches/Cog/spurstackbuild/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/ branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/Info.plist branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/ branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj branches/Cog/spurstackbuild/macbuild/SqueakFFIPrims/SqueakFFIPrims_Prefix.pch branches/Cog/spurstackbuild/macbuild/Template/ branches/Cog/spurstackbuild/macbuild/Template/HowToMakeANewPlugin.txt branches/Cog/spurstackbuild/macbuild/Template/Info.plist branches/Cog/spurstackbuild/macbuild/Template/Template.xcodeproj/ branches/Cog/spurstackbuild/macbuild/Template/Template.xcodeproj/project.pbxproj branches/Cog/spurstackbuild/macbuild/Template/Template_Prefix.pch branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/ branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/English.lproj/ branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/English.lproj/InfoPlist.strings branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/Info.plist branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/PkgInfo branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/ branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.mode1 branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.pbxuser branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj branches/Cog/spurstackbuild/macbuild/UnixOSProcessPlugin/makeit branches/Cog/spurstackbuild/macbuild/makeall branches/Cog/spurstackbuild/macbuild/makeclean branches/Cog/spurstackbuild/macbuild/makevm branches/Cog/spurstackbuild/macbuild/mkNamedPrims.sh branches/Cog/spurstackbuild/macbuild/mvm branches/Cog/spurstackbuild/macbuild/plugins.ext branches/Cog/spurstackbuild/macbuild/plugins.int branches/Cog/spurstackbuild/macbuild/resources/ branches/Cog/spurstackbuild/macbuild/resources/FloatMathPlugin.bundle/ branches/Cog/spurstackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/ branches/Cog/spurstackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Info.plist branches/Cog/spurstackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/ branches/Cog/spurstackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/FloatMathPlugin branches/Cog/spurstackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/PkgInfo branches/Cog/spurstackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Resources/ branches/Cog/spurstackbuild/macbuild/resources/FloatMathPlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spurstackbuild/macbuild/resources/LocalePlugin.bundle/ branches/Cog/spurstackbuild/macbuild/resources/LocalePlugin.bundle/Contents/ branches/Cog/spurstackbuild/macbuild/resources/LocalePlugin.bundle/Contents/Info.plist branches/Cog/spurstackbuild/macbuild/resources/LocalePlugin.bundle/Contents/MacOS/ branches/Cog/spurstackbuild/macbuild/resources/LocalePlugin.bundle/Contents/MacOS/LocalePlugin branches/Cog/spurstackbuild/macbuild/resources/LocalePlugin.bundle/Contents/PkgInfo branches/Cog/spurstackbuild/macbuild/resources/LocalePlugin.bundle/Contents/Resources/ branches/Cog/spurstackbuild/macbuild/resources/LocalePlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/ branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/Croquet.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/GreenCogSqueak.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/Squeak VM.r branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/Squeak.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/SqueakChanges.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/SqueakGeneric.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/SqueakImage.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/SqueakPlugin.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/SqueakProject.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/SqueakScript.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/SqueakSources.icns branches/Cog/spurstackbuild/macbuild/resources/ProjectBuilder/Teleplace.icns branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Info.plist branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/SpellCheck branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/InfoPlist.strings branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Info.plist branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/MacOS/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/MacOS/SpellingPlugin branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/PkgInfo branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/ branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/InfoPlist.strings branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/PkgInfo branches/Cog/spurstackbuild/macbuild/resources/SpellingPlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spurstacksrc/ branches/Cog/spurstacksrc/examplePlugins.ext branches/Cog/spurstacksrc/examplePlugins.int branches/Cog/spurstacksrc/vm/ branches/Cog/spurstacksrc/vm/exampleSqNamedPrims.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/unixbuild/mtbldt/ Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-10-31 23:56:21 UTC (rev 2795) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-11-02 02:56:58 UTC (rev 2796) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.335 uuid: 02e5ae48-52a4-4324-9b6d-887f45be6a12 + CCodeGenerator VMMaker.oscog-eem.493 uuid: d37e2bf0-ffed-4789-be4e-2aa8a9630e47 from - StackToRegisterMappingCogit VMMaker.oscog-eem.335 uuid: 02e5ae48-52a4-4324-9b6d-887f45be6a12 + StackToRegisterMappingCogit VMMaker.oscog-eem.493 uuid: d37e2bf0-ffed-4789-be4e-2aa8a9630e47 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.335 uuid: 02e5ae48-52a4-4324-9b6d-887f45be6a12 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.493 uuid: d37e2bf0-ffed-4789-be4e-2aa8a9630e47 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -24,10 +24,10 @@ char opcode; char machineCodeSize; char maxSize; - unsigned long operands[3]; + unsigned long operands [3]; unsigned long address; struct _AbstractInstruction *dependent; - unsigned char machineCode[10]; + unsigned char machineCode [10]; } AbstractInstruction; #define CogIA32Compiler AbstractInstruction @@ -49,9 +49,9 @@ typedef struct _BytecodeDescriptor { - sqInt (*generator)(void); - sqInt (*spanFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); - sqInt (*needsFrameFunction)(sqInt); + sqInt (*generator )(void); + sqInt (*spanFunction )(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt); + sqInt (*needsFrameFunction )(sqInt); signed char stackDelta; unsigned char opcode; unsigned char numBytes; @@ -76,9 +76,9 @@ typedef struct { - sqInt (*primitiveGenerator)(void); + sqInt (*primitiveGenerator )(void); sqInt primNumArgs; - sqInt (*enabled)(sqInt); + sqInt (*enabled )(sqInt); } PrimitiveDescriptor; #define CogPrimitiveDescriptor PrimitiveDescriptor @@ -112,28 +112,29 @@ /*** Constants ***/ -#define AddCqR 83 -#define AddCwR 90 -#define AddRdRd 97 -#define AddRR 76 +#define AddCqR 85 +#define AddCwR 92 +#define AddRdRd 99 +#define AddRR 78 #define AlignmentNops 2 #define AllButTypeMask 0xFFFFFFFCUL #define AltBlockCreationBytecodeSize 3 #define AltNSSendIsPCAnnotated 0 -#define AndCqR 85 -#define AndCwR 92 -#define AndRR 78 +#define AndCqR 87 +#define AndCwR 94 +#define AndRR 80 #define AnnotationShift 5 #define Arg0Reg -7 #define Arg1Reg -8 -#define ArithmeticShiftRightCqR 69 -#define ArithmeticShiftRightRR 70 +#define ArithmeticShiftRightCqR 71 +#define ArithmeticShiftRightRR 72 +#define BadRegisterSet 1 #define BaseHeaderSize 4 #define BlockCreationBytecodeSize 4 #define BytesPerOop 4 #define BytesPerWord 4 #define Call 9 -#define CDQ 103 +#define CDQ 105 #define ClassMethodContextCompactIndex 14 #define ClassReg -5 #define ClosureFirstCopiedValueIndex 3 @@ -146,20 +147,20 @@ #define CMMaxUsageCount 7 #define CMMethod 2 #define CMOpenPIC 5 -#define CMPXCHGAwR 111 -#define CMPXCHGMwrR 112 -#define CmpCqR 82 -#define CmpCwR 89 -#define CmpRdRd 96 -#define CmpRR 75 +#define CMPXCHGAwR 113 +#define CMPXCHGMwrR 114 +#define CmpCqR 84 +#define CmpCwR 91 +#define CmpRdRd 98 +#define CmpRR 77 #define CompactClasses 28 #define ConstZero 1 -#define ConvertRRd 102 -#define CPUID 106 +#define ConvertRRd 104 +#define CPUID 108 #define Debug DEBUGVM #define DisplacementMask 0x1F #define DisplacementX2N 32 -#define DivRdRd 100 +#define DivRdRd 102 #define DPFPReg0 -9 #define DPFPReg1 -10 #define DPFPReg2 -11 @@ -188,9 +189,10 @@ #define FoxMFReceiver -12 #define FoxThisContext -8 #define FPReg -1 -#define GCModeBecome 3 +#define GCModeBecome 4 #define GCModeFull 1 #define GCModeIncr 2 +#define GCModeScavenge 3 #define GPRegMax -3 #define GPRegMin -8 #define HasBytecodePC 5 @@ -199,8 +201,8 @@ #define HeaderIndex 0 #define HeaderTypeShort 3 #define HeaderTypeSizeAndClass 0 -#define IDIVR 104 -#define IMULRR 105 +#define IDIVR 106 +#define IMULRR 107 #define InstanceSpecificationIndex 2 #define InstructionPointerIndex 1 #define InsufficientCodeSpace -2 @@ -241,14 +243,14 @@ #define JumpZero 16 #define Label 1 #define LastJump 39 -#define LFENCE 107 +#define LFENCE 109 #define LinkReg -17 -#define LOCK 110 -#define LoadEffectiveAddressMwrR 67 -#define LogicalShiftLeftCqR 73 -#define LogicalShiftLeftRR 74 -#define LogicalShiftRightCqR 71 -#define LogicalShiftRightRR 72 +#define LOCK 112 +#define LoadEffectiveAddressMwrR 69 +#define LogicalShiftLeftCqR 75 +#define LogicalShiftLeftRR 76 +#define LogicalShiftRightCqR 73 +#define LogicalShiftRightRR 74 #define LongSizeMask 0xFFFFFFFCUL #define MapEnd 0 #define MaxCompiledPrimitiveIndex 222 @@ -265,7 +267,7 @@ #define MethodCacheSelector 1 #define MethodIndex 3 #define MethodTooBig -4 -#define MFENCE 108 +#define MFENCE 110 #define MFMethodFlagHasContextFlag 1 #define MFMethodFlagIsBlockFlag 2 #define ModReg 3 @@ -273,24 +275,24 @@ #define ModRegRegDisp32 2 #define ModRegRegDisp8 1 #define MoveAwR 41 -#define MoveCqR 56 -#define MoveCwR 57 -#define MoveM16rR 48 -#define MoveM64rRd 61 -#define MoveMbrR 52 +#define MoveCqR 58 +#define MoveCwR 59 +#define MoveM16rR 50 +#define MoveM64rRd 63 +#define MoveMbrR 54 #define MoveMwrR 44 #define MoveRAw 42 -#define MoveRdM64r 62 -#define MoveRdRd 60 -#define MoveRMbr 53 +#define MoveRdM64r 64 +#define MoveRdRd 62 +#define MoveRMbr 55 #define MoveRMwr 45 #define MoveRR 40 #define MoveRXwrR 47 -#define MoveXbrRR 54 +#define MoveXbrRR 56 #define MoveXwrRR 46 #define MULTIPLEBYTECODESETS 1 -#define MulRdRd 99 -#define NegateR 68 +#define MulRdRd 101 +#define NegateR 70 #define NewspeakVM 1 #define Nop 8 #define NotFullyInitialized -1 @@ -298,17 +300,17 @@ #define NumObjRefsInRuntime 2 #define NumSendTrampolines 4 #define NumTrampolines 58 -#define OrCqR 86 -#define OrCwR 93 -#define OrRR 79 -#define PopR 63 -#define PrefetchAw 66 +#define OrCqR 88 +#define OrCwR 95 +#define OrRR 81 +#define PopR 65 +#define PrefetchAw 68 #define PrimCallCollectsProfileSamples 8 #define PrimCallMayCallBack 4 #define PrimCallNeedsNewMethod 1 #define PrimCallNeedsPrimitiveFunction 2 -#define PushCw 65 -#define PushR 64 +#define PushCw 67 +#define PushR 66 #define ReceiverIndex 5 #define ReceiverResultReg -3 #define RetN 10 @@ -318,28 +320,28 @@ #define SelectorDoesNotUnderstand 20 #define SenderIndex 0 #define SendNumArgsReg -6 -#define SFENCE 109 +#define SFENCE 111 #define ShiftForWord 2 #define SIB1 0 #define SIB4 2 #define Size4Bit 0 #define SizeMask 0xFC #define SPReg -2 -#define SqrtRd 101 +#define SqrtRd 103 #define SSBaseOffset 1 #define SSConstant 2 #define SSRegister 3 #define SSSpill 4 -#define SubCqR 84 -#define SubCwR 91 -#define SubRdRd 98 -#define SubRR 77 +#define SubCqR 86 +#define SubCwR 93 +#define SubRdRd 100 +#define SubRR 79 #define TempReg -4 #define TypeMask 0x3 #define ValueIndex 1 -#define XCHGAwR 113 -#define XCHGMwrR 114 -#define XCHGRR 115 +#define XCHGAwR 115 +#define XCHGMwrR 116 +#define XCHGRR 117 #define XMM0L 0 #define XMM1L 2 #define XMM2L 4 @@ -348,8 +350,8 @@ #define XMM5L 10 #define XMM6L 12 #define XMM7L 14 -#define XorCwR 94 -#define XorRR 80 +#define XorCwR 96 +#define XorRR 82 #define YoungSelectorInPIC -5 @@ -432,7 +434,7 @@ static sqInt compileAbstractInstructionsFromthrough(sqInt start, sqInt end); static sqInt compileBlockBodies(void); static sqInt compileBlockDispatch(void); -static void compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex); +static sqInt compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex); static void compileBlockEntry(BlockStart *blockStart); static void compileBlockFrameBuild(BlockStart *blockStart); static void compileBlockFramelessEntry(BlockStart *blockStart); @@ -442,7 +444,8 @@ static sqInt compileCPICCase0Case1MethodtagisMNUCasenumArgs(CogMethod *cPIC, CogMethod *case0CogMethod, sqInt case1Method, sqInt case1Tag, sqInt isMNUCase, sqInt numArgs); static sqInt compileEntireMethod(void); static void compileEntry(void); -static void compileFrameBuild(void); +static sqInt compileFallbackToInterpreterPrimitive(void); +static sqInt compileFrameBuild(void); static void compileGetErrorCode(void); static sqInt compileInterpreterPrimitive(void (*primitiveRoutine)(void)); static sqInt compileMethodBody(void); @@ -461,7 +464,7 @@ static sqInt concretizeAddCqR(AbstractInstruction * self_in_concretizeAddCqR); static sqInt concretizeAddCwR(AbstractInstruction * self_in_concretizeAddCwR); static sqInt concretizeAddRR(AbstractInstruction * self_in_concretizeAddRR); -static void concretizeAlignmentNops(AbstractInstruction * self_in_concretizeAlignmentNops); +static AbstractInstruction * concretizeAlignmentNops(AbstractInstruction * self_in_concretizeAlignmentNops); static sqInt concretizeAndCqR(AbstractInstruction * self_in_concretizeAndCqR); static sqInt concretizeAndCwR(AbstractInstruction * self_in_concretizeAndCwR); static sqInt concretizeAndRR(AbstractInstruction * self_in_concretizeAndRR); @@ -544,7 +547,7 @@ static BytecodeFixup * ensureFixupAt(sqInt targetIndex); static BytecodeFixup * ensureNonMergeFixupAt(sqInt targetIndex); static void ensureReceiverResultRegContainsSelf(void); -static void ensureSpilledAtfrom(CogSimStackEntry * self_in_ensureSpilledAtfrom, sqInt baseOffset, sqInt baseRegister); +static CogSimStackEntry * ensureSpilledAtfrom(CogSimStackEntry * self_in_ensureSpilledAtfrom, sqInt baseOffset, sqInt baseRegister); void enterCogCodePopReceiver(void); void enterCogCodePopReceiverAndClassRegs(void); void enterCogCodePopReceiverArg0Regs(void); @@ -554,7 +557,7 @@ static sqInt extendedPushBytecode(void); static sqInt extendedStoreAndPopBytecode(void); static sqInt extendedStoreBytecode(void); -static void fillInBlockHeadersAt(sqInt startAddress); +static sqInt fillInBlockHeadersAt(sqInt startAddress); static CogMethod * fillInCPICHeadersizenumArgsnumCaseshasMNUCaseselector(CogMethod *pic, sqInt size, sqInt numArgs, sqInt numCases, sqInt hasMNUCase, sqInt selector); static CogMethod * fillInMethodHeadersizeselector(CogMethod *method, sqInt size, sqInt selector); static CogMethod * fillInOPICHeadersizenumArgsselector(CogMethod *pic, sqInt size, sqInt numArgs, sqInt selector); @@ -576,7 +579,7 @@ static sqInt genCheckForInterruptsTrampoline(void); static sqInt genConvertIntegerToSmallIntegerInScratchReg(sqInt scratchReg); static sqInt genConvertSmallIntegerToIntegerInScratchReg(sqInt scratchReg); -static void genDivRRQuoRem(AbstractInstruction * self_in_genDivRRQuoRem, sqInt abstractRegDivisor, sqInt abstractRegDividend, sqInt abstractRegQuotient, sqInt abstractRegRemainder); +static AbstractInstruction * genDivRRQuoRem(AbstractInstruction * self_in_genDivRRQuoRem, sqInt abstractRegDivisor, sqInt abstractRegDividend, sqInt abstractRegQuotient, sqInt abstractRegRemainder); static sqInt genDoubleArithmeticpreOpCheck(sqInt arithmeticOperator, AbstractInstruction *(*preOpCheckOrNil)(int rcvrReg, int argReg)); static sqInt genDoubleComparisoninvert(AbstractInstruction *(*jumpOpcodeGenerator)(void *), sqInt invertComparison); static AbstractInstruction * genDoubleFailIfZeroArgRcvrarg(sqInt rcvrReg, sqInt argReg); @@ -608,17 +611,18 @@ static sqInt genExtStoreReceiverVariableBytecode(void); static sqInt genExtUnconditionalJump(void); static void generateCaptureCStackPointers(sqInt captureFramePointer); -static void generateCheckFeatures(AbstractInstruction * self_in_generateCheckFeatures); +static AbstractInstruction * generateCheckFeatures(AbstractInstruction * self_in_generateCheckFeatures); static void generateClosedPICPrototype(void); static CogMethod * generateCogMethod(sqInt selector); static void generateEnilopmarts(void); -static void generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush); +static AbstractInstruction * generateICacheFlush(AbstractInstruction * self_in_generateICacheFlush); static sqInt generateInstructionsAt(sqInt eventualAbsoluteAddress); -static void generateLowLevelTryLock(AbstractInstruction * self_in_generateLowLevelTryLock, sqInt vmOwnerLockAddress); -static void generateLowLevelUnlock(AbstractInstruction * self_in_generateLowLevelUnlock, sqInt vmOwnerLockAddress); +static AbstractInstruction * generateLowLevelTryLock(AbstractInstruction * self_in_generateLowLevelTryLock, sqInt vmOwnerLockAddress); +static AbstractInstruction * generateLowLevelUnlock(AbstractInstruction * self_in_generateLowLevelUnlock, sqInt vmOwnerLockAddress); static sqInt generateMapAtstart(sqInt addressOrNull, sqInt startAddress); static void generateMissAbortTrampolines(void); static void generateNewspeakRuntime(void); +static void generateObjectRepresentationTrampolines(void); static void generateOpenPICPrototype(void); static void generateRunTimeTrampolines(void); static void generateSendTrampolines(void); @@ -631,16 +635,20 @@ static sqInt genFetchIndexRegisterfrominto(sqInt indexReg, sqInt tableObj, sqInt destReg); static sqInt genFramelessStorePopReceiverVariable(sqInt popBoolean, sqInt slotIndex); static sqInt genGetClassFormatOfNonIntintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); -static sqInt genGetClassObjectOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); -static sqInt genGetCompactClassIndexNonIntOfinto(sqInt instReg, sqInt destReg); +static sqInt genGetClassObjectOfintoscratchReginstRegIsReceiver(sqInt instReg, sqInt destReg, sqInt scratchReg, sqInt instRegIsReceiver); +static AbstractInstruction * genGetClassTagOfintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); +static sqInt genGetCompactClassIndexNonImmOfinto(sqInt instReg, sqInt destReg); static sqInt genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg); static sqInt genGetFixedFieldsOfPointerNonIntintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); -static sqInt genGetHashFieldNonIntOfasSmallIntegerInto(sqInt instReg, sqInt destReg); +static sqInt genGetHashFieldNonImmOfasSmallIntegerInto(sqInt instReg, sqInt destReg); static sqInt genGetImplicitReceiverForforPush(sqInt selector, sqInt forPushSendBar); static sqInt genGetLeafCallStackPointer(void); -static void genGetLeafCallStackPointerFunction(AbstractInstruction * self_in_genGetLeafCallStackPointerFunction); +static AbstractInstruction * genGetLeafCallStackPointerFunction(AbstractInstruction * self_in_genGetLeafCallStackPointerFunction); static sqInt genInnerPICAbortTrampoline(char *name); static sqInt genInnerPrimitiveAt(sqInt retNoffset); +static sqInt genInnerPrimitiveNewMethod(sqInt retNoffset); +static sqInt genInnerPrimitiveNewWithArg(sqInt retNoffset); +static sqInt genInnerPrimitiveNew(sqInt retNoffset); static sqInt genInnerPrimitiveSize(sqInt retNoffset); static sqInt genInnerPrimitiveStringAt(sqInt retNOffset); static sqInt genJumpBackTo(sqInt targetBytecodePC); @@ -651,6 +659,7 @@ static AbstractInstruction * genJumpFPLess(AbstractInstruction * self_in_genJumpFPLess, void *jumpTarget); static AbstractInstruction * genJumpFPNotEqual(AbstractInstruction * self_in_genJumpFPNotEqual, void *jumpTarget); static sqInt genJumpIfto(sqInt boolean, sqInt targetBytecodePC); +static AbstractInstruction * genJumpImmediateInScratchReg(sqInt aRegister); static AbstractInstruction * genJumpNotSmallIntegerInScratchReg(sqInt aRegister); static AbstractInstruction * genJumpSmallIntegerInScratchReg(sqInt aRegister); static sqInt genJumpTo(sqInt targetBytecodePC); @@ -669,7 +678,7 @@ static sqInt genMarshalledSendSupernumArgs(sqInt selector, sqInt numArgs); static sqInt genMarshalledSendnumArgs(sqInt selector, sqInt numArgs); static sqInt genMethodAbortTrampolineFor(sqInt numArgs); -static void genMulRR(AbstractInstruction * self_in_genMulRR, sqInt regSource, sqInt regDest); +static AbstractInstruction * genMulRR(AbstractInstruction * self_in_genMulRR, sqInt regSource, sqInt regDest); static sqInt genMustBeBooleanTrampolineForcalled(sqInt boolean, char *trampolineName); static sqInt genNonLocalReturnTrampoline(void); static sqInt genPassConstasArgument(AbstractInstruction * self_in_genPassConstasArgument, sqInt constant, sqInt zeroRelativeArgIndex); @@ -689,7 +698,6 @@ static sqInt genPrimitiveDiv(void); static sqInt genPrimitiveDivide(void); static sqInt genPrimitiveEqual(void); -static sqInt genPrimitiveEquivalent(void); static sqInt genPrimitiveFloatAdd(void); static sqInt genPrimitiveFloatDivide(void); static sqInt genPrimitiveFloatEqual(void); @@ -703,13 +711,17 @@ static sqInt genPrimitiveFloatSubtract(void); static sqInt genPrimitiveGreaterOrEqual(void); static sqInt genPrimitiveGreaterThan(void); +static sqInt genPrimitiveIdentical(void); static sqInt genPrimitiveIdentityHash(void); static sqInt genPrimitiveLessOrEqual(void); static sqInt genPrimitiveLessThan(void); static sqInt genPrimitiveMod(void); static sqInt genPrimitiveMultiply(void); +static sqInt genPrimitiveNew(void); +static sqInt genPrimitiveNewMethod(void); +static sqInt genPrimitiveNewWithArg(void); static sqInt genPrimitiveNotEqual(void); -static sqInt genPrimitiveNotEquivalent(void); +static sqInt genPrimitiveNotIdentical(void); static sqInt genPrimitiveQuo(void); static sqInt genPrimitiveSize(void); static sqInt genPrimitiveStringAt(void); @@ -777,17 +789,15 @@ static sqInt genShortJumpIfFalse(void); static sqInt genShortJumpIfTrue(void); static sqInt genShortUnconditionalJump(void); -static sqInt genSmallIntegerComparison(sqInt jumpOpcode); +static sqInt genSmallIntegerComparisonorDoubleComparison(sqInt jumpOpcode, AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)); static sqInt genSpecialSelectorArithmetic(void); static sqInt genSpecialSelectorClass(void); static sqInt genSpecialSelectorComparison(void); static sqInt genSpecialSelectorEqualsEquals(void); static sqInt genSpecialSelectorSend(void); -static sqInt genSSPushSlotreg(sqInt index, sqInt baseReg); static sqInt genStoreAndPopReceiverVariableBytecode(void); static sqInt genStoreAndPopRemoteTempLongBytecode(void); static sqInt genStoreAndPopTemporaryVariableBytecode(void); -static sqInt genStoreCheckTrampoline(void); static sqInt genStoreImmediateInSourceRegslotIndexdestReg(sqInt sourceReg, sqInt index, sqInt destReg); static sqInt genStorePopLiteralVariable(sqInt popBoolean, sqInt litVarIndex); static sqInt genStorePopMaybeContextReceiverVariable(sqInt popBoolean, sqInt slotIndex); @@ -805,12 +815,12 @@ static sqInt genTrampolineForcalledargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt resultReg); static sqInt genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(void *aRoutine, char *trampolineName, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil, sqInt appendBoolean); static sqInt genUpArrowReturn(void); -static void genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister); +static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister); static AbstractInstruction * gen(sqInt opcode); static AbstractInstruction * genoperand(sqInt opcode, sqInt operand); static AbstractInstruction * genoperandoperand(sqInt opcode, sqInt operandOne, sqInt operandTwo); static AbstractInstruction * genoperandoperandoperand(sqInt opcode, sqInt operandOne, sqInt operandTwo, sqInt operandThree); -static sqInt getInlineCacheClassTagFrominto(sqInt sourceReg, sqInt destReg); +static AbstractInstruction * getInlineCacheClassTagFrominto(sqInt sourceReg, sqInt destReg); static AbstractInstruction * getJmpTarget(AbstractInstruction * self_in_getJmpTarget); static sqInt getLiteral(sqInt litIndex); static sqInt hasDoublePrecisionFloatingPointSupport(AbstractInstruction * self_in_hasDoublePrecisionFloatingPointSupport); @@ -818,6 +828,9 @@ static sqInt hasPCDependentInstructions(AbstractInstruction * self_in_hasPCDependentInstructions); static sqInt hasSSE2Instructions(AbstractInstruction * self_in_hasSSE2Instructions); static sqInt hasSSEInstructions(AbstractInstruction * self_in_hasSSEInstructions); +static sqInt implementsNew(void); +static sqInt implementsNewMethod(void); +static sqInt implementsNewWithArg(void); static sqInt incrementUsageOfTargetIfLinkedSendmcpcignored(sqInt annotation, char *mcpc, sqInt superfluity); static sqInt initialClosedPICUsageCount(void); static void initializeBackend(void); @@ -840,7 +853,7 @@ static sqInt isBigEndian(AbstractInstruction * self_in_isBigEndian); static sqInt isBranch(BytecodeDescriptor * self_in_isBranch); static sqInt isCallPreceedingReturnPC(AbstractInstruction * self_in_isCallPreceedingReturnPC, sqInt mcpc); -static sqInt isImmediate(sqInt anOop); +static sqInt isHashSetOnInstanceCreation(void); static sqInt isJump(AbstractInstruction * self_in_isJump); static sqInt isJumpAt(AbstractInstruction * self_in_isJumpAt, sqInt pc); static sqInt isLongJump(AbstractInstruction * self_in_isLongJump); @@ -854,6 +867,8 @@ static AbstractInstruction * gJumpFPEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreaterOrEqual(void *jumpTarget); static AbstractInstruction * gJumpFPGreater(void *jumpTarget); +static AbstractInstruction * gJumpFPLessOrEqual(void *jumpTarget); +static AbstractInstruction * gJumpFPLess(void *jumpTarget); static AbstractInstruction * gJumpFPNotEqual(void *jumpTarget); static AbstractInstruction * JumpRT(sqInt callTarget); static AbstractInstruction * jmpTarget(AbstractInstruction * self_in_jmpTarget, AbstractInstruction *anAbstractInstruction); @@ -889,10 +904,11 @@ static void mapObjectReferencesInMachineCodeForBecome(void); static void mapObjectReferencesInMachineCodeForFullGC(void); static void mapObjectReferencesInMachineCodeForIncrementalGC(void); +static void mapObjectReferencesInMachineCodeForScavenge(void); void mapObjectReferencesInMachineCode(sqInt gcMode); static void markAndTraceLiteralIfYoung(sqInt literal); static void markAndTraceLiteral(sqInt literal); -static void markAndTraceMachineCodeForIncrementalGC(void); +static void markAndTraceMachineCodeForNewSpaceGC(void); static void markAndTraceObjectReferencesInGeneratedRuntime(void); void markAndTraceObjectsOrFreeMachineCode(sqInt inFullGC); static sqInt markAndTraceOrFreeCogMethodfirstVisit(CogMethod *cogMethod, sqInt firstVisit); @@ -906,10 +922,10 @@ static void marshallSendArguments(sqInt numArgs); usqInt maxCogMethodAddress(void); static sqInt maybeFreeCogMethodDoesntLookKosher(CogMethod *cogMethod); -static void maybeGenerateCheckFeatures(void); -static void maybeGenerateICacheFlush(void); +static sqInt maybeGenerateCheckFeatures(void); +static sqInt maybeGenerateICacheFlush(void); sqInt mcPCForstartBcpcin(sqInt bcpc, sqInt startbcpc, CogBlockMethod *cogMethod); -static void mergeAtfrom(CogSimStackEntry * self_in_mergeAtfrom, sqInt baseOffset, sqInt baseRegister); +static CogSimStackEntry * mergeAtfrom(CogSimStackEntry * self_in_mergeAtfrom, sqInt baseOffset, sqInt baseRegister); static void mergeafterContinuation(BytecodeFixup *fixup, sqInt mergeWithContinuation); static sqInt methodAbortTrampolineFor(sqInt numArgs); static CogMethod * methodAfter(CogMethod *cogMethod); @@ -925,7 +941,7 @@ static sqInt needsFrameNever(sqInt stackDelta); static sqInt noAssertMethodClassAssociationOf(sqInt methodPointer); static sqInt noCogMethodsMaximallyMarked(void); -static void nopsFromto(AbstractInstruction * self_in_nopsFromto, sqInt startAddr, sqInt endAddr); +static AbstractInstruction * nopsFromto(AbstractInstruction * self_in_nopsFromto, sqInt startAddr, sqInt endAddr); static sqInt noTargetsFreeInClosedPIC(CogMethod *cPIC); static sqInt numberOfSpillsInTopNItems(sqInt n); static sqInt numCheckFeaturesOpcodes(AbstractInstruction * self_in_numCheckFeaturesOpcodes); @@ -934,6 +950,9 @@ static sqInt numMethods(void); sqInt numMethodsOfType(sqInt cogMethodType); static sqInt numSmallIntegerBits(void); +static sqInt objectRepresentationImplementsNewMethod(sqInt primIndex); +static sqInt objectRepresentationImplementsNewWithArg(sqInt primIndex); +static sqInt objectRepresentationImplementsNew(sqInt primIndex); static sqInt occurrencesInYoungReferrers(CogMethod *cogMethod); static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop); static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop); @@ -941,12 +960,12 @@ static sqInt outputInstructionsAt(sqInt startAddress); static sqInt outputInstructionsForGeneratedRuntimeAt(sqInt startAddress); static AbstractInstruction * gPushCw(sqInt wordConstant); -static void padIfPossibleWithNopsFromto(AbstractInstruction * self_in_padIfPossibleWithNopsFromto, sqInt startAddr, sqInt endAddr); +static AbstractInstruction * padIfPossibleWithNopsFromto(AbstractInstruction * self_in_padIfPossibleWithNopsFromto, sqInt startAddr, sqInt endAddr); sqInt patchToOpenPICFornumArgsreceiver(sqInt selector, sqInt numArgs, sqInt receiver); sqInt pcisWithinMethod(char *address, CogMethod *cogMethod); static sqInt picAbortTrampolineFor(sqInt numArgs); static void planCompaction(void); -static void popToReg(CogSimStackEntry * self_in_popToReg, sqInt reg); +static CogSimStackEntry * popToReg(CogSimStackEntry * self_in_popToReg, sqInt reg); static sqInt prevInstIsPCAnnotated(void); static PrimitiveDescriptor * primitiveGeneratorOrNil(void); void printCogMethodFor(void *address); @@ -958,7 +977,7 @@ static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex); static sqInt processorHasDoublePrecisionFloatingPointSupport(sqInt ignoredPrimIndex); static sqInt processorHasMultiply(sqInt ignoredPrimIndex); -static void pruneYoungReferrers(void); +static sqInt pruneYoungReferrers(void); static AbstractInstruction * gRetN(sqInt offset); void recordCallOffsetInof(CogMethod *cogMethod, void *callLabelArg); static void recordGeneratedRunTimeaddress(char *aString, sqInt address); @@ -970,24 +989,25 @@ static sqInt registerMaskForandand(sqInt reg1, sqInt reg2, sqInt reg3); static sqInt registerOrNil(CogSimStackEntry * self_in_registerOrNil); static void reinitializeFixupsFromthrough(sqInt start, sqInt end); -static void relocateAndPruneYoungReferrers(void); -static void relocateCallBeforeReturnPCby(AbstractInstruction * self_in_relocateCallBeforeReturnPCby, sqInt retpc, sqInt delta); +static sqInt relocateAndPruneYoungReferrers(void); +static AbstractInstruction * relocateCallBeforeReturnPCby(AbstractInstruction * self_in_relocateCallBeforeReturnPCby, sqInt retpc, sqInt delta); static void relocateCallsAndSelfReferencesInMethod(CogMethod *cogMethod); static void relocateCallsInClosedPIC(CogMethod *cPIC); static sqInt relocateIfCallOrMethodReferencemcpcdelta(sqInt annotation, char *mcpc, sqInt delta); -static void relocateJumpBeforeFollowingAddressby(AbstractInstruction * self_in_relocateJumpBeforeFollowingAddressby, sqInt pc, sqInt delta); -static void relocateMethodReferenceBeforeAddressby(AbstractInstruction * self_in_relocateMethodReferenceBeforeAddressby, sqInt pc, sqInt delta); +static AbstractInstruction * relocateJumpBeforeFollowingAddressby(AbstractInstruction * self_in_relocateJumpBeforeFollowingAddressby, sqInt pc, sqInt delta); +static AbstractInstruction * relocateMethodReferenceBeforeAddressby(AbstractInstruction * self_in_relocateMethodReferenceBeforeAddressby, sqInt pc, sqInt delta); static sqInt relocateMethodsPreCompaction(void); static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr); static sqInt remapNSIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr); +static sqInt remapObj(sqInt oop); static sqInt remapOop(sqInt oop); -static void removeFromOpenPICList(CogMethod *anOpenPIC); -static void removeFromUnpairedMethodList(CogMethod *aCogMethod); -static void resolveJumpTarget(AbstractInstruction * self_in_resolveJumpTarget); +static sqInt removeFromOpenPICList(CogMethod *anOpenPIC); +static sqInt removeFromUnpairedMethodList(CogMethod *aCogMethod); +static AbstractInstruction * resolveJumpTarget(AbstractInstruction * self_in_resolveJumpTarget); static sqInt returnRegForStoreCheck(void); static sqInt rewriteCallAttarget(AbstractInstruction * self_in_rewriteCallAttarget, usqInt callSiteReturnAddress, usqInt callTargetAddress); static sqInt rewriteInlineCacheAttagtarget(AbstractInstruction * self_in_rewriteInlineCacheAttagtarget, usqInt callSiteReturnAddress, sqInt cacheTag, usqInt callTargetAddress); -static void rewriteInlineCacheTagat(AbstractInstruction * self_in_rewriteInlineCacheTagat, sqInt cacheTag, sqInt callSiteReturnAddress); +static AbstractInstruction * rewriteInlineCacheTagat(AbstractInstruction * self_in_rewriteInlineCacheTagat, sqInt cacheTag, sqInt callSiteReturnAddress); static sqInt rewriteJumpLongAttarget(AbstractInstruction * self_in_rewriteJumpLongAttarget, sqInt callSiteReturnAddress, sqInt callTargetAddress); void rewritePrimInvocationInto(CogMethod *cogMethod, void (*primFunctionPointer)(void)); static sqInt roomOnYoungReferrersList(void); @@ -1008,6 +1028,7 @@ static sqInt sizeImmediateGroup1at(AbstractInstruction * self_in_sizeImmediateGroup1at, sqInt op, sqInt pc); static sqInt sizePCDependentInstructionAt(AbstractInstruction * self_in_sizePCDependentInstructionAt, sqInt eventualAbsoluteAddress); static sqInt slotOffsetOfInstVarIndex(sqInt index); +static sqInt smallIntegerIsOnlyImmediateType(void); static sqInt spanForCleanBlockStartingAt(sqInt startPC); static void ssAllocateCallReg(sqInt requiredReg); static void ssAllocateCallRegand(sqInt requiredReg1, sqInt requiredReg2); @@ -1033,8 +1054,8 @@ static CogSimStackEntry * ssValue(sqInt n); static sqInt stackBytesForNumArgs(AbstractInstruction * self_in_stackBytesForNumArgs, sqInt numArgs); static sqInt stackPageInterruptHeadroomBytes(AbstractInstruction * self_in_stackPageInterruptHeadroomBytes); -static void storeLiteralbeforeFollowingAddress(AbstractInstruction * self_in_storeLiteralbeforeFollowingAddress, sqInt literal, sqInt followingAddress); -static void storeToReg(CogSimStackEntry * self_in_storeToReg, sqInt reg); +static AbstractInstruction * storeLiteralbeforeFollowingAddress(AbstractInstruction * self_in_storeLiteralbeforeFollowingAddress, sqInt literal, sqInt followingAddress); +static CogSimStackEntry * storeToReg(CogSimStackEntry * self_in_storeToReg, sqInt reg); static sqInt sib(AbstractInstruction * self_in_sib, sqInt scale, sqInt indexReg, sqInt baseReg); sqInt traceLinkedSendOffset(void); static char * trampolineNamenumArgs(char *routinePrefix, sqInt numArgs); @@ -1049,7 +1070,7 @@ void unlinkSendsToFree(void); void unlinkSendsToandFreeIf(sqInt targetMethodObject, sqInt freeIfTrue); static sqInt unsignedShortAt(AbstractInstruction * self_in_unsignedShortAt, sqInt byteAddress); -static void updateLabel(AbstractInstruction * self_in_updateLabel, AbstractInstruction *labelInstruction); +static AbstractInstruction * updateLabel(AbstractInstruction * self_in_updateLabel, AbstractInstruction *labelInstruction); static sqInt updateMaybeObjRefAt(sqInt mcpc); static sqInt v3or4PushNilSize(sqInt aMethodObj); static sqInt v3or4IsPushNil(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj); @@ -1779,15 +1800,16 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, + { genPrimitiveNew, 0, objectRepresentationImplementsNew }, + { genPrimitiveNewWithArg, 1, objectRepresentationImplementsNewWithArg }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { 0, -1, 0 }, - { 0, -1, 0 }, { genPrimitiveIdentityHash, 0, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, + { genPrimitiveNewMethod, 2, objectRepresentationImplementsNewMethod }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -1818,8 +1840,7 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { 0, -1, 0 }, - { genPrimitiveEquivalent, 1, 0 }, + { genPrimitiveIdentical, 1, 0 }, { genPrimitiveClass, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -1878,7 +1899,7 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { genPrimitiveNotEquivalent, 1, 0 }, + { genPrimitiveNotIdentical, 1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -1910,11 +1931,11 @@ { genFastPrimFail, -1, 0 }, { genFastPrimFail, -1, 0 }, { 0, -1, 0 }, - { genPrimitiveClosureValue, -1, 0 }, - { genPrimitiveClosureValue, -1, 0 }, - { genPrimitiveClosureValue, -1, 0 }, - { genPrimitiveClosureValue, -1, 0 }, - { genPrimitiveClosureValue, -1, 0 }, + { genPrimitiveClosureValue, 0, 0 }, + { genPrimitiveClosureValue, 1, 0 }, + { genPrimitiveClosureValue, 2, 0 }, + { genPrimitiveClosureValue, 3, 0 }, + { genPrimitiveClosureValue, 4, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, @@ -1930,8 +1951,8 @@ { 0, -1, 0 }, { 0, -1, 0 }, { 0, -1, 0 }, - { genPrimitiveClosureValue, -1, 0 }, - { genPrimitiveClosureValue, -1, 0 } + { genPrimitiveClosureValue, 0, 0 }, + { genPrimitiveClosureValue, 1, 0 } }; static sqInt primitiveIndex; void (*realCEEnterCogCodePopReceiverAndClassRegs)(void); @@ -1984,6 +2005,7 @@ annotations = (void *)((char *)fixups + fixupSize); \ opcodeIndex = labelCounter = annotationIndex = 0; \ } while (0) +#define blockAlignment(self) 8 #define blockStartAt(index) (&blockStarts[index]) #define breakOnImplicitReceiver() (traceFlags & 64) #define ceBaseFrameReturnPC() ceBaseFrameReturnTrampoline @@ -1991,7 +2013,6 @@ #define ceCheckFeatures() ceCheckFeaturesFunction() #define cePositive32BitIntegerTrampoline() cePositive32BitIntegerTrampoline #define ceReturnToInterpreterPC() ((usqInt)ceReturnToInterpreterTrampoline) -#define ceStoreCheckTrampoline() ceStoreCheckTrampoline #define cFramePointerAddress() ((unsigned long)&CFramePointer) #define cPICNumCases stackCheckOffset #define cPICNumCasesHack hack hack hack i.e. the getter macro does all the work @@ -2157,10 +2178,8 @@ for (i = 1, iLimiT = (literalCountOf(methodObj)); i <= iLimiT; i += 1) { lit = fetchPointerofObject(i, methodObj); - if (((startPCOrNil = startPCOrNilOfLiteralin(lit, methodObj))) == null) { - null; - } - else { + startPCOrNil = startPCOrNilOfLiteralin(lit, methodObj); + if (!(startPCOrNil == null)) { maxLitIndex = ((maxLitIndex < i) ? i : maxLitIndex); addBlockStartAtnumArgsnumCopiedspan(startPCOrNil - 1, argumentCountOfClosure(lit), copiedValueCountOfClosure(lit), spanForCleanBlockStartingAt(startPCOrNil - 1)); } @@ -2323,7 +2342,7 @@ mzFreeStart += roundedBytes; methodCount += 1; assert(roomOnYoungReferrersList()); - ; + return allocation; } @@ -2490,7 +2509,7 @@ sqInt bytecodePCForstartBcpcin(sqInt mcpc, sqInt startbcpc, CogBlockMethod *cogMethod) { - return mapForbcpcperformUntilarg(cogMethod, startbcpc, findMcpcBcpcMatchingMcpc, ((void *) mcpc)); + return mapForbcpcperformUntilarg(cogMethod, startbcpc, findMcpcBcpcMatchingMcpc, ((void *)mcpc)); } static AbstractInstruction * @@ -2622,7 +2641,7 @@ static sqInt ceClosureCopyDescriptor(sqInt descriptor) { - return createClosureNumArgsnumCopiedstartpc(descriptor & 63, (((usqInt) descriptor) >> 6) & 63, ((usqInt) descriptor) >> 12); + return createClosureNumArgsnumCopiedstartpc(descriptor & 0x3F, (((usqInt) descriptor) >> 6) & 0x3F, ((usqInt) descriptor) >> 12); } @@ -2647,11 +2666,10 @@ sqInt result; sqInt selector; - ; + outerReturn = stackTop(); if (((cPIC->cPICNumCases)) < numPICCases) { /* begin lookup:for:methodAndErrorSelectorInto: */ - VM_LABEL(0lookupformethodAndErrorSelectorInto); selector = (cPIC->selector); methodOrSelectorIndex = lookupreceiver(selector, receiver); if ((((usqInt)methodOrSelectorIndex)) >= (nilObject())) { @@ -2814,7 +2832,6 @@ assert(((((sqInt)targetMethod)) + cmEntryOffset) == entryPoint); /* begin lookup:for:methodAndErrorSelectorInto: */ - VM_LABEL(1lookupformethodAndErrorSelectorInto); selector = (targetMethod->selector); methodOrSelectorIndex = lookupreceiver(selector, receiver); if ((((usqInt)methodOrSelectorIndex)) >= (nilObject())) { @@ -2923,14 +2940,14 @@ } if ((couldBeObject(literal)) && (isReallyYoungObject(literal))) { - if (!(asserta((((CogMethod *) cogMethod)->cmRefersToYoung)))) { + if (!(asserta(((((CogMethod *) cogMethod))->cmRefersToYoung)))) { return 2; } } } if ((annotation == IsSendCall) || (annotation == IsNSSendCall)) { - if (!(asserta(((((CogMethod *) cogMethod)->cmType)) == CMMethod))) { + if (!(asserta((((((CogMethod *) cogMethod))->cmType)) == CMMethod))) { return 3; } cacheTag = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); @@ -2939,7 +2956,7 @@ } if ((couldBeObject(cacheTag)) && (isReallyYoungObject(cacheTag))) { - if (!(asserta((((CogMethod *) cogMethod)->cmRefersToYoung)))) { + if (!(asserta(((((CogMethod *) cogMethod))->cmRefersToYoung)))) { return 5; } } @@ -2949,7 +2966,6 @@ /* It's a linked send; find which kind. */ /* begin offsetAndSendTableFor:annotation:into: */ - VM_LABEL(0offsetAndSendTableForannotationinto); if ((entryPoint & entryPointMask) == checkedEntryAlignment) { assert(annotation == IsSendCall); offset = cmEntryOffset; @@ -2982,8 +2998,13 @@ static sqInt checkIfValidObjectRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - sqInt cacheTag; + sqInt entryPoint; sqInt literal; + sqInt off; + sqInt offset; + sqInt selectorOrCacheTag; + sqInt *sendTable; + sqInt table; if (annotation == IsObjectReference) { literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); @@ -2998,15 +3019,59 @@ } if ((annotation == IsSendCall) || (annotation == IsNSSendCall)) { - cacheTag = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); - if (!(checkValidInlineCacheTag(cacheTag))) { - print("cache tag/selector leak in CM "); - printHex(((sqInt)cogMethod)); - print(" @ "); - printHex(((sqInt)mcpc)); - cr(); - return 1; + entryPoint = callTargetFromReturnAddress(backEnd, ((sqInt)mcpc)); + /* begin offsetAndSendTableFor:annotation:into: */ + if ((entryPoint & entryPointMask) == checkedEntryAlignment) { + assert(annotation == IsSendCall); + offset = cmEntryOffset; + sendTable = sendTrampolines; + } + else { + if ((entryPoint & entryPointMask) == dynSuperEntryAlignment) { + assert(annotation == IsNSSendCall); + offset = cmDynSuperEntryOffset; + sendTable = dynamicSuperSendTrampolines; + + } + else { + assert(annotation == IsSendCall); + offset = cmNoCheckEntryOffset; + sendTable = superSendTrampolines; + + } + } + + selectorOrCacheTag = inlineCacheTagAt(backEnd, ((sqInt)mcpc)); + if ((entryPoint > methodZoneBase) + && ((offset != cmNoCheckEntryOffset) + && (((((((CogMethod *) (entryPoint + offset)))->cmType)) != CMOpenPIC) + || (!(couldBeObject(selectorOrCacheTag)))))) { + + /* linked non-super send, cacheTag is a cacheTag */ + + if (!(checkValidInlineCacheTag(selectorOrCacheTag))) { + print("cache tag leak in CM "); + printHex(((sqInt)cogMethod)); + print(" @ "); + printHex(((sqInt)mcpc)); + cr(); + return 1; + } + } + else { + + /* unlinked send or super send; cacheTag is a selector */ + + if (!(checkValidObjectReference(selectorOrCacheTag))) { + print("selector leak in CM "); + printHex(((sqInt)cogMethod)); + print(" @ "); + printHex(((sqInt)mcpc)); + cr(); + return 1; + } + } } return 0; } @@ -3357,7 +3422,7 @@ cogMethod = methodAfter(cogMethod); } if ((((label = stringForCString("CCFree"))) == null) - || (((value = cePositive32BitIntegerFor(freeStart()))) == null)) { + || (((value = cePositive32BitIntegerFor(mzFreeStart))) == null)) { popRemappableOop(); return null; } @@ -3480,12 +3545,12 @@ if (((cogMethod->methodHeader)) != 0) { return 22; } - if ((((sqInt) ((cogMethod->objectHeader)))) >= 0) { + if (((cogMethod->objectHeader)) >= 0) { if ((((cogMethod->methodObject)) != 0) && ((((cogMethod->methodObject)) < methodZoneBase) - || ((((cogMethod->methodObject)) > ((freeStart()) - openPICSize)) + || ((((cogMethod->methodObject)) > (mzFreeStart - openPICSize)) || (((((cogMethod->methodObject)) & (BytesPerWord - 1)) != 0) - || (((((CogMethod *) ((cogMethod->methodObject)))->cmType)) != CMOpenPIC))))) { + || ((((((CogMethod *) ((cogMethod->methodObject))))->cmType)) != CMOpenPIC))))) { return 23; } } @@ -3496,7 +3561,7 @@ } if (((cogMethod->cmType)) == CMClosedPIC) { if (((cogMethod->blockSize)) != closedPICSize) { - return 31; + return 0x1F; } if (!(((((cogMethod->cPICNumCases)) >= 1) && (((cogMethod->cPICNumCases)) <= numPICCases)))) { return 32; @@ -3648,10 +3713,7 @@ haltmsg("Compilation of breakMethod"); } cogMethod = findPreviouslyCompiledVersionOfwith(aMethodObj, aSelectorOop); - if (cogMethod == null) { - null; - } - else { + if (!(cogMethod == null)) { if (!(methodHasCogMethod(aMethodObj))) { assert((rawHeaderOf(aMethodObj)) == ((cogMethod->methodHeader))); (cogMethod->methodObject = aMethodObj); @@ -3694,13 +3756,13 @@ compactCompiledCode(nullHeaderForMachineCodeMethod()); assert(allMethodsHaveCorrectHeader()); assert(kosherYoungReferrers()); - flushICacheFromto(processor, methodZoneBase, freeStart()); + flushICacheFromto(processor, methodZoneBase, mzFreeStart); } static void compactCompiledCode(sqInt objectHeaderValue) { - sqInt bytes; + unsigned short bytes; CogMethod *dest; CogMethod *source; @@ -3730,7 +3792,8 @@ source = methodAfter(source); } if (source >= (limitZony())) { - haltmsg("no free methods; cannot compact."); return; + haltmsg("no free methods; cannot compact."); + return; } dest = source; while (source < (limitZony())) { @@ -3840,7 +3903,7 @@ deadCode = 1; } } - ; + byte0 = (fetchByteofObject(bytecodePC, methodObj)) + bytecodeSetOffset; descriptor = generatorAt(byte0); if (((descriptor->numBytes)) > 1) { @@ -3938,7 +4001,7 @@ if (initialStackPtr == simStackPtr) break; assert(initialStackPtr > simStackPtr); (blockStart->numInitialNils = (((blockStart->numInitialNils)) + simStackPtr) - initialStackPtr); - ((blockStart->fakeHeader)->dependent = null); + (((blockStart->fakeHeader))->dependent = null); reinitializeFixupsFromthrough(((blockStart->startpc)) + ((blockStart->numInitialNils)), (((blockStart->startpc)) + ((blockStart->span))) - 1); bzero(abstractOpcodes + initialOpcodeIndex, (opcodeIndex - initialOpcodeIndex) * sizeof(AbstractInstruction)); @@ -3978,7 +4041,7 @@ return 0; } -static void +static sqInt compileBlockDispatchFromto(sqInt lowBlockStartIndex, sqInt highBlockStartIndex) { BlockStart *blockStart; @@ -3994,7 +4057,7 @@ /* begin Jump: */ jumpTarget = (blockStart->entryLabel); genoperand(Jump, ((sqInt)jumpTarget)); - return; + return null; } halfWay = ((sqInt) (highBlockStartIndex + lowBlockStartIndex) >> 1); assert(((halfWay >= lowBlockStartIndex) && (halfWay <= highBlockStartIndex))); @@ -4010,14 +4073,14 @@ jumpTarget1 = (blockStart->entryLabel); genoperand(JumpLessOrEqual, ((sqInt)jumpTarget1)); compileBlockDispatchFromto(halfWay + 1, highBlockStartIndex); - return; + return null; } if ((halfWay + 1) == highBlockStartIndex) { blockStart = blockStartAt(highBlockStartIndex); /* begin JumpGreater: */ jumpTarget2 = (blockStart->entryLabel); genoperand(JumpGreater, ((sqInt)jumpTarget2)); - compileBlockDispatchFromto(lowBlockStartIndex, halfWay); return; + return compileBlockDispatchFromto(lowBlockStartIndex, halfWay); } /* begin JumpGreater: */ jmp = genoperand(JumpGreater, ((sqInt)0)); @@ -4045,14 +4108,28 @@ sqInt alignment; /* begin AlignmentNops: */ - alignment = sizeof(CogBlockMethod); + alignment = blockAlignment(); genoperand(AlignmentNops, alignment); - assert((sizeof(CogBlockMethod)) == (2 * BytesPerWord)); (blockStart->fakeHeader = gLabel()); - /* begin Fill32: */ - genoperand(Fill32, 0); - /* begin Fill32: */ - genoperand(Fill32, 0); + + switch (sizeof(CogBlockMethod)) { + case 2 * BytesPerWord: + /* begin Fill32: */ + genoperand(Fill32, 0); + /* begin Fill32: */ + genoperand(Fill32, 0); + break; + case 3 * BytesPerWord: + /* begin Fill32: */ + genoperand(Fill32, 0); + /* begin Fill32: */ + genoperand(Fill32, 0); + /* begin Fill32: */ + genoperand(Fill32, 0); + break; + default: + error("Case not found and no otherwise clause"); + } (blockStart->entryLabel = gLabel()); if (needsFrame) { compileBlockFrameBuild(blockStart); @@ -4222,7 +4299,7 @@ sqInt result; methodOrBlockNumTemps = tempCountOf(methodObj); - ; + hasYoungReferent = (isYoung(methodObj)) || (isYoung(selector)); methodOrBlockNumArgs = argumentCountOf(methodObj); @@ -4268,11 +4345,7 @@ static AbstractInstruction * compileCPICEntry(void) { - /* begin AlignmentNops: */ - genoperand(AlignmentNops, ((BytesPerWord < 8) ? 8 : BytesPerWord)); - /* begin Label */ - entry = genoperandoperand(Label, (labelCounter += 1), bytecodePC); - getInlineCacheClassTagFrominto(ReceiverResultReg, TempReg); + entry = getInlineCacheClassTagFrominto(ReceiverResultReg, TempReg); /* begin CmpR:R: */ genoperandoperand(CmpRR, ClassReg, TempReg); /* begin JumpNonZero: */ @@ -4303,7 +4376,7 @@ if ((!isMNUCase) && (methodHasCogMethod(case1Method))) { operand = 0; - targetEntry = ((void *) ((((sqInt)(cogMethodOf(case1Method)))) + cmNoCheckEntryOffset)); + targetEntry = ((void *)((((sqInt)(cogMethodOf(case1Method)))) + cmNoCheckEntryOffset)); } else { assert((case1Method == null) @@ -4377,19 +4450,12 @@ static void compileEntry(void) { - - /* 1st nop differentiates dynSuperEntry from no-check entry if using nextMethod */ - /* begin Nop */ gen(Nop); /* begin Nop */ dynSuperEntry = gen(Nop); - /* begin AlignmentNops: */ - genoperand(AlignmentNops, ((BytesPerWord < 8) ? 8 : BytesPerWord)); - /* begin Label */ - entry = genoperandoperand(Label, (labelCounter += 1), bytecodePC); - getInlineCacheClassTagFrominto(ReceiverResultReg, TempReg); + entry = getInlineCacheClassTagFrominto(ReceiverResultReg, TempReg); /* begin CmpR:R: */ genoperandoperand(CmpRR, ClassReg, TempReg); /* begin JumpNonZero: */ @@ -4401,7 +4467,13 @@ } } +static sqInt +compileFallbackToInterpreterPrimitive(void) +{ + return compileInterpreterPrimitive(functionPointerForCompiledMethodprimitiveIndex(methodObj, primitiveIndex)); +} + /* Build a frame for a CogMethod activation. See CoInterpreter class>>initializeFrameIndices. receiver (in ReceiverResultReg) arg0 @@ -4423,7 +4495,7 @@ class>>initializeFrameIndices. Override to push the register receiver and register arguments, if any. */ -static void +static sqInt compileFrameBuild(void) { sqInt address; @@ -4434,11 +4506,11 @@ if (!needsFrame) { initSimStackForFramelessMethod(initialPC); - return; + return 0; } genPushRegisterArgs(); if (!needsFrame) { - return; + return 0; } methodHeader = headerOf(methodObj); if (hasLinkRegister(backEnd)) { @@ -4565,6 +4637,7 @@ AbstractInstruction *jmpSampleNonPrim; AbstractInstruction *jmpSamplePrim; sqInt offset; + sqInt retpc; /* Save processor fp, sp and return pc in the interpreter's frame stack and instruction pointers */ @@ -4642,9 +4715,12 @@ /* Sideways call the C primitive routine so that we return through cePrimReturnEnterCogCode. */ - genSubstituteReturnAddress(backEnd, ((flags & PrimCallCollectsProfileSamples) != 0 + /* begin genSubstituteReturnAddress: */ + retpc = ((flags & PrimCallCollectsProfileSamples) != 0 ? cePrimReturnEnterCogCodeProfiling - : cePrimReturnEnterCogCode)); + : cePrimReturnEnterCogCode); + /* begin PushCw: */ + genoperand(PushCw, retpc); JumpRT(((sqInt)primitiveRoutine)); /* begin Label */ primInvokeLabel = genoperandoperand(Label, (labelCounter += 1), bytecodePC); @@ -4796,12 +4872,11 @@ sqInt routine; compilePICProlog(numArgs); - /* begin AlignmentNops: */ - genoperand(AlignmentNops, ((BytesPerWord < 8) ? 8 : BytesPerWord)); - /* begin Label */ - entry = genoperandoperand(Label, (labelCounter += 1), bytecodePC); - genGetClassObjectOfintoscratchReg(ReceiverResultReg, ClassReg, TempReg); - flag("lookupInMethodCacheSel:class:"); + + /* Do first of three probes. See CoInterpreter>>lookupInMethodCacheSel:classTag: */ + + entry = genGetClassTagOfintoscratchReg(ReceiverResultReg, ClassReg, TempReg); + flag("lookupInMethodCacheSel:classTag:"); /* begin MoveR:R: */ genoperandoperand(MoveRR, ClassReg, SendNumArgsReg); annotateobjRef(gXorCwR(selector, ClassReg), selector); @@ -5021,10 +5096,7 @@ ? Call : Jump), ((usqInt)aRoutine)); if (callJumpBar) { - if (resultRegOrNil == null) { - null; - } - else { + if (!(resultRegOrNil == null)) { genWriteCResultIntoReg(backEnd, resultRegOrNil); } if (saveRegs) { @@ -5059,6 +5131,8 @@ static void computeEntryOffsets(void) { + sqInt uncheckedEntryAlignment; + allocateOpcodesbytecodes(20, 0); methodOrBlockNumArgs = 0; compileAbort(); @@ -5080,11 +5154,12 @@ error("cannot differentiate checked and unchecked entry-points with current cog method alignment"); } checkedEntryAlignment = cmEntryOffset & entryPointMask; - assert(checkedEntryAlignment != (cmNoCheckEntryOffset & entryPointMask)); + uncheckedEntryAlignment = cmNoCheckEntryOffset & entryPointMask; + assert(checkedEntryAlignment != uncheckedEntryAlignment); cmDynSuperEntryOffset = ((dynSuperEntry->address)) - methodZoneBase; dynSuperEntryAlignment = cmDynSuperEntryOffset & entryPointMask; - assert((cmDynSuperEntryOffset & entryPointMask) != (cmEntryOffset & entryPointMask)); - assert((cmDynSuperEntryOffset & entryPointMask) != (cmNoCheckEntryOffset & entryPointMask)); + assert(dynSuperEntryAlignment != checkedEntryAlignment); + assert(dynSuperEntryAlignment != uncheckedEntryAlignment); } @@ -5095,8 +5170,16 @@ computeJumpTargetOffsetPlus(AbstractInstruction * self_in_computeJumpTargetOffsetPlus, sqInt anPCOffset) { AbstractInstruction *jumpTarget; + AbstractInstruction *jumpTarget1; - jumpTarget = jumpTargetAddress(self_in_computeJumpTargetOffsetPlus); + /* begin jumpTargetAddress */ + jumpTarget1 = ((AbstractInstruction *) (((self_in_computeJumpTargetOffsetPlus->operands))[0])); + assertSaneJumpTarget(jumpTarget1); + if (isAnInstruction(self_in_computeJumpTargetOffsetPlus, jumpTarget1)) { + jumpTarget1 = ((AbstractInstruction *) ((jumpTarget1->address))); + } + assert(jumpTarget1 != 0); + jumpTarget = jumpTarget1; return (((sqInt) jumpTarget)) - (((sqInt) (((self_in_computeJumpTargetOffsetPlus->address)) + anPCOffset))); } @@ -5474,23 +5557,23 @@ if (isQuick(self_in_concretizeAddCqR, value)) { ((self_in_concretizeAddCqR->machineCode))[0] = 131; ((self_in_concretizeAddCqR->machineCode))[1] = (modRMRO(self_in_concretizeAddCqR, ModReg, reg, 0)); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.493.mcz
by commits＠source.squeak.org 02 Nov '13

02 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.493.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.493 Author: eem Time: 1 November 2013, 5:29:24.503 pm UUID: d37e2bf0-ffed-4789-be4e-2aa8a9630e47 Ancestors: VMMaker.oscog-eem.492 Revise TStmtListNode>>stream:endsWithAnyOf: top work around a bug in UTF8TextConverter>>nextPut:toStream: which avoids line-end conversion. Move or remove teh references to Debug in enterCogCodePopReceiver et al to prevent the Debug VM from aborting. =============== Diff against VMMaker.oscog-eem.492 =============== Item was changed: ----- Method: Cogit>>enterCogCodePopReceiver (in category 'debugging') ----- enterCogCodePopReceiver "This is a static version of ceEnterCogCodePopReceiverReg for break-pointing when debugging in C." <api> <inline: false> - "(and this exists only to reference Debug)" - Debug ifFalse: [self error: 'what??']. "This exists only for break-pointing." + self cCode: [self realCEEnterCogCodePopReceiverReg] + inSmalltalk: [self ceEnterCogCodePopReceiverReg]. + "(and this exists only to reference Debug)" + Debug ifFalse: [self error: 'what??']! - self cCode: 'realCEEnterCogCodePopReceiverReg()' - inSmalltalk: [self ceEnterCogCodePopReceiverReg]! Item was changed: ----- Method: Cogit>>enterCogCodePopReceiverAndClassRegs (in category 'debugging') ----- enterCogCodePopReceiverAndClassRegs "This is a static version of ceEnterCogCodePopReceiverAndClassRegs for break-pointing when debugging in C." <api> <inline: false> - "(and this exists only to reference Debug)" - Debug ifFalse: [self error: 'what??']. "This exists only for break-pointing." + self cCode: [self realCEEnterCogCodePopReceiverAndClassRegs] - self cCode: 'realCEEnterCogCodePopReceiverAndClassRegs()' inSmalltalk: [self ceEnterCogCodePopReceiverAndClassRegs]! Item was changed: ----- Method: StackToRegisterMappingCogit>>enterCogCodePopReceiverArg0Regs (in category 'debugging') ----- enterCogCodePopReceiverArg0Regs "This is a static version of ceEnterCogCodePopReceiverArg0Regs for break-pointing when debugging in C." <api> <inline: false> - "(and this exists only to reference Debug)" - Debug ifFalse: [self error: 'what??']. "This exists only for break-pointing." + self cCode: [self realCEEnterCogCodePopReceiverArg0Regs] - self cCode: 'realCEEnterCogCodePopReceiverArg0Regs()' inSmalltalk: [self ceEnterCogCodePopReceiverArg0Regs]! Item was changed: ----- Method: StackToRegisterMappingCogit>>enterCogCodePopReceiverArg1Arg0Regs (in category 'debugging') ----- enterCogCodePopReceiverArg1Arg0Regs "This is a static version of ceEnterCogCodePopReceiverArg1Arg0Regs for break-pointing when debugging in C." <api> <inline: false> - "(and this exists only to reference Debug)" - Debug ifFalse: [self error: 'what??']. "This exists only for break-pointing." + self cCode: [self realCEEnterCogCodePopReceiverArg1Arg0Regs] - self cCode: 'realCEEnterCogCodePopReceiverArg1Arg0Regs()' inSmalltalk: [self ceEnterCogCodePopReceiverArg1Arg0Regs]! Item was changed: ----- Method: TStmtListNode>>stream:endsWithAnyOf: (in category 'testing') ----- stream: aStream endsWithAnyOf: characters "Answer if the given stream ends in any of the characters, ignoring whitespace." | pos ch popped | pos := aStream position. aStream class = WriteStream ifTrue: "i.e. nested in StreamContents" [[pos > 0] whileTrue: [ch := aStream originalContents at: pos. ch isSeparator ifFalse: [^characters includes: ch]. pos := pos - 1]. ^false]. popped := OrderedCollection new. [pos > 0] whileTrue: [ch := popped addFirst: (aStream position: pos - 1; peek). ch isSeparator ifFalse: + [popped notEmpty ifTrue: "it almost always is" + ["*don't* use nextPutAll: to work around a bug in UTF8TextConverter + >>nextPut:toStream: which avoids line-end conversion; sigh." + popped do: + [:c| aStream nextPut: c]]. - [aStream nextPutAll: popped. ^characters includes: ch]. pos := pos - 1]. + "*don't* use nextPutAll: to work around a bug in UTF8TextConverter>> + nextPut:toStream: which avoids line-end conversion; sigh." + popped do: + [:c| aStream nextPut: c]. - aStream nextPutAll: popped. ^false!

1 0

VM Maker: VMMaker.oscog-eem.492.mcz
by commits＠source.squeak.org 02 Nov '13

02 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.492.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.492 Author: eem Time: 1 November 2013, 3:18:11.586 pm UUID: f0d31c8c-9e93-4d77-ae6e-4e853a7d0d38 Ancestors: VMMaker.oscog-eem.491 Cope with char, short et al as return types, promoting them to #sqInt in harmonizeSignedAndUnsignedTypesIn:. Remove several extraneous type decls for missing vars. Fix conflicitng return types in dispatchConcretize by declaring it void. Put commas between conflicting types in the report. L:ine up the return under the statement when mapping ^expr to expr; return; in void methods. =============== Diff against VMMaker.oscog-eem.491 =============== Item was changed: ----- Method: CCodeGenerator>>returnTypeForSend: (in category 'type inference') ----- returnTypeForSend: aTSendNode "Answer the return type for a send. Absent sends default to #sqInt." | sel | ^(methods at: (sel := aTSendNode selector) ifAbsent: nil) ifNil: [kernelReturnTypes at: sel ifAbsent: [^sel caseOf: { [#asVoidPointer] -> [#'void *']. [#asUnsignedInteger] -> [#usqInt]. [#asLong] -> [#long]. [#asUnsignedLong] -> [#'unsigned long']. [#signedIntToLong] -> [#usqInt]. "c.f. generateSignedIntToLong:on:indent:" [#signedIntToShort] -> [#usqInt]. "c.f. generateSignedIntToShort:on:indent:" [#cCoerce:to:] -> [aTSendNode args last value]. [#cCoerceSimple:to:] -> [aTSendNode args last value] } otherwise: [#sqInt]]] + ifNotNil: + [:m| + m returnType ifNotNil: + [:type| "map fields to #usqInt" + ((type beginsWith: 'unsigned') + and: [(type includes: $:) + and: [type last isDigit]]) + ifTrue: [#usqInt] + ifFalse: [type]]]! - ifNotNil: [:m| m returnType]! Item was changed: ----- Method: CoInterpreter>>ceTraceBlockActivation (in category 'debug support') ----- ceTraceBlockActivation <api> - <var: #cogMethod type: #'CogMethod *'> cogit recordBlockTrace ifTrue: [self recordTrace: TraceBlockActivation thing: (self mframeHomeMethod: framePointer) methodObject source: TraceIsFromMachineCode. cogit printOnTrace ifTrue: [self printActivationNameFor: (self mframeHomeMethod: framePointer) methodObject receiver: (self frameReceiver: framePointer) isBlock: true firstTemporary: nil. self cr]]! Item was changed: ----- Method: CoInterpreter>>createClosureNumArgs:numCopied:startpc: (in category 'trampolines') ----- createClosureNumArgs: numArgs numCopied: numCopied startpc: initialIP <api> | context newClosure | - <var: #sp type: #'char *'> self assert: (self isMachineCodeFrame: framePointer). "Do *not* include the return pc or copied values in the stack contents; hence + ((1 + numCopied) * BytesPerWord)" context := self ensureFrameIsMarried: framePointer SP: stackPointer + ((1 + numCopied) * BytesPerWord). newClosure := self closureIn: context numArgs: numArgs instructionPointer: initialIP numCopiedValues: numCopied. cogit recordSendTrace ifTrue: [self recordTrace: TraceBlockCreation thing: newClosure source: TraceIsFromMachineCode]. numCopied > 0 ifTrue: ["N.B. the expression ((numCopied - i) * BytesPerWord)) skips the return address" 0 to: numCopied - 1 do: [:i| "Assume: have just allocated a new BlockClosure; it must be young. Thus, can use unchecked stores." objectMemory storePointerUnchecked: i + ClosureFirstCopiedValueIndex ofObject: newClosure withValue: (stackPages longAt: stackPointer + ((numCopied - i) * BytesPerWord))]]. "Assume caller will pop stack" ^newClosure! Item was changed: ----- Method: CoInterpreter>>handleMNU:InMachineCodeTo:classForMessage: (in category 'message sending') ----- handleMNU: selectorIndex InMachineCodeTo: rcvr classForMessage: classForMessage "A message send from either an open PIC or an unlinked send has not been understood. Create a message and execute the relevant resulting MNU method. messageSelector is an implicit argument (yuck)." | errSelIdx classForThisMessage | - <var: #cogMethod type: #'CogMethod *'> self assert: (objectMemory addressCouldBeOop: rcvr). instructionPointer := self popStack. self createActualMessageTo: classForMessage. messageSelector := objectMemory splObj: selectorIndex. (self lookupInMethodCacheSel: messageSelector classTag: (objectMemory classTagForClass: lkupClass)) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector] ifFalse: [errSelIdx := self lookupMethodNoMNUEtcInClass: (classForThisMessage := lkupClass). errSelIdx ~= 0 ifTrue: [selectorIndex = SelectorDoesNotUnderstand ifTrue: [self error: 'Recursive not understood error encountered']. self push: instructionPointer. ^self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: classForThisMessage]]. (self maybeMethodHasCogMethod: newMethod) ifTrue: [self push: instructionPointer. self executeCogMethodFromUnlinkedSend: (self cogMethodOf: newMethod) withReceiver: rcvr. "NOTREACHED" self assert: false]. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>printFrameMethodFor: (in category 'debug printing') ----- printFrameMethodFor: theFP - | address it homeMethod obj | <inline: false> + | address it homeMethod obj | <var: #theFP type: #'char *'> <var: #address type: #'char *'> - <var: #cogMethod type: #'CogBlockMethod *'> <var: #homeMethod type: #'CogMethod *'> address := theFP + FoxMethod. it := stackPages longAt: address. self printHex: address asInteger; printChar: $:. self print: ' method: '; printHex: it. self tab. ((self isMachineCodeFrame: theFP) and: [self mframeIsBlockActivation: theFP]) ifTrue: [homeMethod := self mframeHomeMethod: theFP. self print: 'hm: '; printHex: homeMethod asInteger; tab]. obj := self frameMethodObject: theFP. self printHex: obj; space; shortPrintOop: obj! Item was changed: ----- Method: CoInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" | swapBytes headerStart headerSize dataSize oldBaseAddr minimumMemory heapSize bytesRead bytesToShift hdrNumStackPages hdrEdenBytes hdrCogCodeSize headerFlags hdrMaxExtSemTabSize firstSegSize | + <var: #f type: #sqImageFile> + <var: #dataSize type: #'size_t'> + <var: #desiredHeapSize type: #usqInt> + <var: #headerStart type: #squeakFileOffsetType> + <var: #imageOffset type: #squeakFileOffsetType> - <var: #f type: 'sqImageFile '> - <var: #memStart type: 'usqInt'> - <var: #desiredHeapSize type: 'usqInt'> - <var: #headerStart type: 'squeakFileOffsetType '> - <var: #dataSize type: 'size_t '> - <var: #imageOffset type: 'squeakFileOffsetType '> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. "N.B. not used." hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [self defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "compare memory requirements with availability" minimumMemory := cogCodeSize "no need to include the stackZone; this is alloca'ed" + dataSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize := cogCodeSize "no need to include the stackZone; this is alloca'ed" + desiredHeapSize "+ edenBytes" "don't include edenBytes; this is part of the heap and so part of desiredHeapSize" + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap and ancilliary data structures" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. objectMemory memory = nil ifTrue: [self insufficientMemoryAvailableError]. heapBase := objectMemory memory + cogCodeSize. self assert: objectMemory startOfMemory = heapBase. objectMemory setHeapBase: heapBase memoryLimit: objectMemory memory + heapSize - 24 "decrease memoryLimit a tad for safety (?!!?!!? eem eem 10/9/2013 15:15)" endOfMemory: heapBase + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" self initializeCodeGenerator. ^dataSize! Item was changed: ----- Method: CogARMCompiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." + <returnTypeC: #void> - opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [AlignmentNops] -> [^self concretizeAlignmentNops]. [Fill16] -> [^self concretizeFill16]. [Fill32] -> [^self concretizeFill32]. [FillFromWord] -> [^self concretizeFillFromWord]. [Nop] -> [^self concretizeNop]. "Specific Control/Data Movement" "[LDM] -> [^self concretizeLDM]. [STM] -> [^self concretizeSTM]." "Control" [Call] -> [^self concretizeCall]. [JumpR] -> [^self concretizeJumpR]. [JumpLong] -> [^self concretizeConditionalJumpLong: AL]. [JumpLongZero] -> [^self concretizeConditionalJumpLong: EQ]. [JumpLongNonZero] -> [^self concretizeConditionalJumpLong: NE]. [Jump] -> [^self concretizeConditionalJump: AL]. [JumpZero] -> [^self concretizeConditionalJump: EQ]. [JumpNonZero] -> [^self concretizeConditionalJump: NE]. [JumpNegative] -> [^self concretizeConditionalJump: MI]. [JumpNonNegative] -> [^self concretizeConditionalJump: PL]. [JumpOverflow] -> [^self concretizeConditionalJump: VS]. [JumpNoOverflow] -> [^self concretizeConditionalJump: VC]. [JumpCarry] -> [^self concretizeConditionalJump: CS]. [JumpNoCarry] -> [^self concretizeConditionalJump: CC]. [JumpLess] -> [^self concretizeConditionalJump: LT]. [JumpGreaterOrEqual] -> [^self concretizeConditionalJump: GE]. [JumpGreater] -> [^self concretizeConditionalJump: GT]. [JumpLessOrEqual] -> [^self concretizeConditionalJump: LE]. [JumpBelow] -> [^self concretizeConditionalJump: CC]. "unsigned lower" [JumpAboveOrEqual] -> [^self concretizeConditionalJump: CS]. "unsigned greater or equal" [JumpAbove] -> [^self concretizeConditionalJump: HI]. [JumpBelowOrEqual] -> [^self concretizeConditionalJump: LS]. [JumpFPEqual] -> [^self concretizeFPConditionalJump: EQ]. [JumpFPNotEqual] -> [^self concretizeFPConditionalJump: NE]. "[JumpFPLess] -> [^self concretizeFPConditionalJump: LT]. [JumpFPGreaterOrEqual] -> [^self concretizeFPConditionalJump: GE]. [JumpFPGreater] -> [^self concretizeFPConditionalJump: GT]. [JumpFPLessOrEqual] -> [^self concretizeFPConditionalJump: LE]. [JumpFPOrdered] -> [^self concretizeFPConditionalJump: VC]. [JumpFPUnordered] -> [^self concretizeFPConditionalJump: VS]." [RetN] -> [^self concretizeRetN]. "Arithmetic" [AddCqR] -> [^self concretizeAddCqR]. [AddCwR] -> [^self concretizeDataOperationCwR: 4]. [AddRR] -> [^self concretizeDataOperationRR: 4]. "[AddRdRd] -> [^self concretizeSEE2OpRdRd: 16r58]." [AndCqR] -> [^self concretizeDataOperationCqR: 0]. [AndCwR] -> [^self concretizeDataOperationCwR: 0]. [AndRR] -> [^self concretizeDataOperationRR: 0]. [CmpCqR] -> [^self concretizeCmpCqR]. [CmpCwR] -> [^self concretizeCmpCwR]. [CmpRR] -> [^self concretizeCmpRR]. [CmpRdRd] -> [^self concretizeCmpRdRd]. "[DivRdRd] -> [^self concretizeSEE2OpRdRd: 16r5E]. [MulRdRd] -> [^self concretizeSEE2OpRdRd: 16r59]." [OrCqR] -> [^self concretizeDataOperationCqR: 16rC]. [OrCwR] -> [^self concretizeDataOperationCwR: 16rC]. [OrRR] -> [^self concretizeDataOperationRR: 16rC]. [SubCqR] -> [^self concretizeSubCqR]. [SubCwR] -> [^self concretizeDataOperationCwR: 2]. [SubRR] -> [^self concretizeDataOperationRR: 2]. "[SubRdRd] -> [^self concretizeSEE2OpRdRd: 16r5C]." [SqrtRd] -> [^self concretizeSqrtRd]. [XorCqR] -> [^self concretizeDataOperationCqR: 1]. [XorCwR] -> [^self concretizeDataOperationCwR: 1]. [XorRR] -> [^self concretizeDataOperationRR: 1]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [ArithmeticShiftRightCqR] -> [^self concretizeArithmeticShiftRightCqR]. [LogicalShiftRightCqR] -> [^self concretizeLogicalShiftRightCqR]. [LogicalShiftLeftCqR] -> [^self concretizeLogicalShiftLeftCqR]. [ArithmeticShiftRightRR] -> [^self concretizeArithmeticShiftRightRR]. [LogicalShiftLeftRR] -> [^self concretizeLogicalShiftLeftRR]. [LogicalShiftRightRR] -> [^self concretizeLogicalShiftRightRR]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. [MoveRR] -> [^self concretizeMoveRR]. [MoveAwR] -> [^self concretizeMoveAwR]. [MoveRAw] -> [^self concretizeMoveRAw]. "While the two MoveMbR and MoveMwR are quite similar (off by 1 bit), they differ way more to MoveM16R and MoveM64R. Because of that, they are not merged." [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeMoveRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveM64rRd] -> [^self concretizeMoveM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeMoveRdM64r]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. "Conversion" [ConvertRRd] -> [^self concretizeConvertRRd]. "ARM specific opcodes" [LDMFD] -> [^self concretizeLDMFD]. [STMFD] -> [^self concretizeSTMFD] }! Item was changed: ----- Method: CogIA32Compiler>>concretizeConditionalJump: (in category 'generate machine code') ----- concretizeConditionalJump: conditionCode "Will get inlined into concretizeAt: switch." "Sizing/generating jumps. Jump targets can be to absolute addresses or other abstract instructions. Generating initial trampolines instructions may have no maxSize and be to absolute addresses. Otherwise instructions must have a machineCodeSize which must be kept to." <inline: true> | offset | - <var: #jumpTarget type: #'AbstractInstruction *'> offset := self computeJumpTargetOffsetPlus: 2. (machineCodeSize = 0 "size not determined because no sizeJump pass; generating initial trampolines" ifTrue: [self isQuick: offset] ifFalse: [machineCodeSize = 2]) ifTrue: [machineCode at: 0 put: 16r70 + conditionCode; at: 1 put: (offset bitAnd: 16rFF). ^machineCodeSize := 2]. ^self concretizeConditionalJumpLong: conditionCode! Item was changed: ----- Method: CogIA32Compiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." + <returnTypeC: #void> - opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [AlignmentNops] -> [^self concretizeAlignmentNops]. [Fill16] -> [^self concretizeFill16]. [Fill32] -> [^self concretizeFill32]. [FillFromWord] -> [^self concretizeFillFromWord]. [Nop] -> [^self concretizeNop]. "Specific Control/Data Movement" [CDQ] -> [^self concretizeCDQ]. [IDIVR] -> [^self concretizeIDIVR]. [IMULRR] -> [^self concretizeMulRR]. [CPUID] -> [^self concretizeCPUID]. [CMPXCHGAwR] -> [^self concretizeCMPXCHGAwR]. [CMPXCHGMwrR] -> [^self concretizeCMPXCHGMwrR]. [LFENCE] -> [^self concretizeFENCE: 5]. [MFENCE] -> [^self concretizeFENCE: 6]. [SFENCE] -> [^self concretizeFENCE: 7]. [LOCK] -> [^self concretizeLOCK]. [XCHGAwR] -> [^self concretizeXCHGAwR]. [XCHGMwrR] -> [^self concretizeXCHGMwrR]. [XCHGRR] -> [^self concretizeXCHGRR]. "Control" [Call] -> [^self concretizeCall]. [JumpR] -> [^self concretizeJumpR]. [JumpLong] -> [^self concretizeJumpLong]. [JumpLongZero] -> [^self concretizeConditionalJumpLong: 16r4]. [JumpLongNonZero] -> [^self concretizeConditionalJumpLong: 16r5]. [Jump] -> [^self concretizeJump]. "Table B-1 Intel® 64 and IA-32 Architectures Software Developer's Manual Volume 1: Basic Architecture" [JumpZero] -> [^self concretizeConditionalJump: 16r4]. [JumpNonZero] -> [^self concretizeConditionalJump: 16r5]. [JumpNegative] -> [^self concretizeConditionalJump: 16r8]. [JumpNonNegative] -> [^self concretizeConditionalJump: 16r9]. [JumpOverflow] -> [^self concretizeConditionalJump: 16r0]. [JumpNoOverflow] -> [^self concretizeConditionalJump: 16r1]. [JumpCarry] -> [^self concretizeConditionalJump: 16r2]. [JumpNoCarry] -> [^self concretizeConditionalJump: 16r3]. [JumpLess] -> [^self concretizeConditionalJump: 16rC]. [JumpGreaterOrEqual] -> [^self concretizeConditionalJump: 16rD]. [JumpGreater] -> [^self concretizeConditionalJump: 16rF]. [JumpLessOrEqual] -> [^self concretizeConditionalJump: 16rE]. [JumpBelow] -> [^self concretizeConditionalJump: 16r2]. [JumpAboveOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpAbove] -> [^self concretizeConditionalJump: 16r7]. [JumpBelowOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPEqual] -> [^self concretizeConditionalJump: 16r4]. [JumpFPNotEqual] -> [^self concretizeConditionalJump: 16r5]. [JumpFPLess] -> [^self concretizeConditionalJump: 16r2]. [JumpFPGreaterOrEqual] -> [^self concretizeConditionalJump: 16r3]. [JumpFPGreater] -> [^self concretizeConditionalJump: 16r7]. [JumpFPLessOrEqual] -> [^self concretizeConditionalJump: 16r6]. [JumpFPOrdered] -> [^self concretizeConditionalJump: 16rB]. [JumpFPUnordered] -> [^self concretizeConditionalJump: 16rA]. [RetN] -> [^self concretizeRetN]. "Arithmetic" [AddCqR] -> [^self concretizeAddCqR]. [AddCwR] -> [^self concretizeAddCwR]. [AddRR] -> [^self concretizeAddRR]. [AddRdRd] -> [^self concretizeSEE2OpRdRd: 16r58]. [AndCqR] -> [^self concretizeAndCqR]. [AndCwR] -> [^self concretizeAndCwR]. [AndRR] -> [^self concretizeAndRR]. [CmpCqR] -> [^self concretizeCmpCqR]. [CmpCwR] -> [^self concretizeCmpCwR]. [CmpRR] -> [^self concretizeCmpRR]. [CmpRdRd] -> [^self concretizeCmpRdRd]. [DivRdRd] -> [^self concretizeSEE2OpRdRd: 16r5E]. [MulRdRd] -> [^self concretizeSEE2OpRdRd: 16r59]. [OrCqR] -> [^self concretizeOrCqR]. [OrCwR] -> [^self concretizeOrCwR]. [OrRR] -> [^self concretizeOrRR]. [SubCqR] -> [^self concretizeSubCqR]. [SubCwR] -> [^self concretizeSubCwR]. [SubRR] -> [^self concretizeSubRR]. [SubRdRd] -> [^self concretizeSEE2OpRdRd: 16r5C]. [SqrtRd] -> [^self concretizeSqrtRd]. [XorCwR] -> [^self concretizeXorCwR]. [XorRR] -> [^self concretizeXorRR]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [ArithmeticShiftRightCqR] -> [^self concretizeArithmeticShiftRightCqR]. [LogicalShiftRightCqR] -> [^self concretizeLogicalShiftRightCqR]. [LogicalShiftLeftCqR] -> [^self concretizeLogicalShiftLeftCqR]. [ArithmeticShiftRightRR] -> [^self concretizeArithmeticShiftRightRR]. [LogicalShiftLeftRR] -> [^self concretizeLogicalShiftLeftRR]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. [MoveRR] -> [^self concretizeMoveRR]. [MoveAwR] -> [^self concretizeMoveAwR]. [MoveRAw] -> [^self concretizeMoveRAw]. [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeMoveRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveM64rRd] -> [^self concretizeMoveM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeMoveRdM64r]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. "Conversion" [ConvertRRd] -> [^self concretizeConvertRRd] }! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genInnerPrimitiveSize: (in category 'primitive generators') ----- genInnerPrimitiveSize: retNoffset | jumpSI jumpNotIndexable jumpIsContext | "c.f. StackInterpreter>>stSizeOf: lengthOf:baseHeader:format: fixedFieldsOf:format:length:" + <var: #jumpSI type: #'AbstractInstruction *'> - <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpNotIndexable type: #'AbstractInstruction *'> <var: #jumpIsContext type: #'AbstractInstruction *'> cogit MoveR: ReceiverResultReg R: TempReg. jumpSI := self genJumpSmallIntegerInScratchReg: TempReg. self genGetSizeOf: ReceiverResultReg into: ClassReg formatReg: SendNumArgsReg scratchReg: TempReg abortJumpsInto: [:jnx :jic| jumpNotIndexable := jnx. jumpIsContext := jic]. self genConvertIntegerToSmallIntegerInScratchReg: ClassReg. cogit MoveR: ClassReg R: ReceiverResultReg. cogit RetN: retNoffset. jumpSI jmpTarget: (jumpNotIndexable jmpTarget: (jumpIsContext jmpTarget: cogit Label)). ^0! Item was changed: ----- Method: Cogit>>generateCogMethod: (in category 'generate machine code') ----- generateCogMethod: selector "We handle jump sizing simply. First we make a pass that asks each instruction to compute its maximum size. Then we make a pass that sizes jumps based on the maxmimum sizes. Then we make a pass that fixes up jumps. When fixing up a jump the jump is not allowed to choose a smaller offset but must stick to the size set in the second pass." + <returnTypeC: #'CogMethod *'> | codeSize headerSize mapSize totalSize startAddress result method | <var: #method type: #'CogMethod *'> - <var: #blockStart type: #'BlockStart *'> - <var: #headerReference type: #'AbstractInstruction *'> - <returnTypeC: #'CogMethod *'> headerSize := self sizeof: CogMethod. methodLabel address: headerSize negated. self computeMaximumSizes. methodLabel concretizeAt: methodZone freeStart. codeSize := self generateInstructionsAt: methodLabel address + headerSize. mapSize := self generateMapAt: 0 start: methodLabel address + cmNoCheckEntryOffset. totalSize := methodZone roundUpLength: headerSize + codeSize + mapSize. totalSize > MaxMethodSize ifTrue: [^self cCoerceSimple: MethodTooBig to: #'CogMethod *']. startAddress := methodZone allocate: totalSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. self assert: startAddress + cmEntryOffset = entry address. self assert: startAddress + cmNoCheckEntryOffset = noCheckEntry address. result := self outputInstructionsAt: startAddress + headerSize. self assert: startAddress + headerSize + codeSize = result. backEnd padIfPossibleWithNopsFrom: result to: startAddress + totalSize - mapSize. self generateMapAt: startAddress + totalSize - 1 start: startAddress + cmNoCheckEntryOffset. self fillInBlockHeadersAt: startAddress. method := self fillInMethodHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: totalSize selector: selector. postCompileHook notNil ifTrue: [self perform: postCompileHook with: method with: primInvokeLabel. postCompileHook := nil]. processor flushICacheFrom: startAddress to: startAddress + headerSize + codeSize. ^method! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveDiv (in category 'primitive generators') ----- genPrimitiveDiv | jumpNotSI jumpZero jumpExact jumpSameSign convert | + <var: #convert type: #'AbstractInstruction *'> - <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> + <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpExact type: #'AbstractInstruction *'> <var: #jumpSameSign type: #'AbstractInstruction *'> - <var: #jumpOverflow type: #'AbstractInstruction *'> - <var: #convert type: #'AbstractInstruction *'> self MoveMw: BytesPerWord r: SPReg R: TempReg. self MoveR: TempReg R: ClassReg. self MoveR: TempReg R: Arg1Reg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: ClassReg]. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "If remainder is zero we must check for overflow." self CmpCq: 0 R: ClassReg. jumpExact := self JumpZero: 0. "If arg and remainder signs are different we must round down." self XorR: ClassReg R: Arg1Reg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: Arg1Reg]. jumpSameSign := self JumpGreaterOrEqual: 0. self SubCq: 1 R: TempReg. jumpSameSign jmpTarget: (convert := self Label). objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self flag: 'currently caller pushes result'. self RetN: BytesPerWord * 2. "test for overflow; the only case is SmallInteger minVal // -1" jumpExact jmpTarget: (self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg). self JumpLess: convert. jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label). ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>generateCogMethod: (in category 'generate machine code') ----- generateCogMethod: selector "We handle jump sizing simply. First we make a pass that asks each instruction to compute its maximum size. Then we make a pass that sizes jumps based on the maxmimum sizes. Then we make a pass that fixes up jumps. When fixing up a jump the jump is not allowed to choose a smaller offset but must stick to the size set in the second pass. Override to add counters" + <returnTypeC: #'CogMethod *'> | codeSize headerSize mapSize countersSize totalSize startAddress result method | <var: #method type: #'CogMethod *'> - <var: #blockStart type: #'BlockStart *'> - <var: #headerReference type: #'AbstractInstruction *'> - <returnTypeC: #'CogMethod *'> headerSize := self sizeof: CogMethod. methodLabel address: headerSize negated. self computeMaximumSizes. methodLabel concretizeAt: (methodZone allocate: 0). codeSize := self generateInstructionsAt: methodLabel address + headerSize. mapSize := self generateMapAt: 0 start: methodLabel address + cmNoCheckEntryOffset. countersSize := counterIndex * CounterBytes. totalSize := methodZone roundUpLength: headerSize + codeSize + mapSize + countersSize. totalSize > MaxMethodSize ifTrue: [^self cCoerceSimple: MethodTooBig to: #'CogMethod *']. startAddress := methodZone allocate: totalSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. self assert: startAddress + cmEntryOffset = entry address. self assert: startAddress + cmNoCheckEntryOffset = noCheckEntry address. self regenerateCounterReferences: startAddress + totalSize. result := self outputInstructionsAt: startAddress + headerSize. self assert: startAddress + headerSize + codeSize = result. backEnd nopsFrom: result to: startAddress + totalSize - mapSize. self generateMapAt: startAddress + totalSize - countersSize - 1 start: startAddress + cmNoCheckEntryOffset. self fillInBlockHeadersAt: startAddress. self fillInCounters: counterIndex atEndAddress: startAddress + totalSize. method := self fillInMethodHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: totalSize selector: selector. postCompileHook notNil ifTrue: [self perform: postCompileHook with: method with: primInvokeLabel. postCompileHook := nil]. processor flushICacheFrom: startAddress to: startAddress + headerSize + codeSize. ^method! Item was changed: ----- Method: StackInterpreter>>readImageFromFile:HeapSize:StartingAt: (in category 'image save/restore') ----- readImageFromFile: f HeapSize: desiredHeapSize StartingAt: imageOffset "Read an image from the given file stream, allocating the given amount of memory to its object heap. Fail if the image has an unknown format or requires more than the given amount of memory." "Details: This method detects when the image was stored on a machine with the opposite byte ordering from this machine and swaps the bytes automatically. Furthermore, it allows the header information to start 512 bytes into the file, since some file transfer programs for the Macintosh apparently prepend a Mac-specific header of this size. Note that this same 512 bytes of prefix area could also be used to store an exec command on Unix systems, allowing one to launch Smalltalk by invoking the image name as a command." "This code is based on C code by Ian Piumarta and Smalltalk code by Tim Rowledge. Many thanks to both of you!!!!" | swapBytes headerStart headerSize dataSize oldBaseAddr hdrNumStackPages minimumMemory heapBase bytesRead bytesToShift heapSize hdrEdenBytes headerFlags hdrMaxExtSemTabSize firstSegSize | + <var: #f type: #sqImageFile> + <var: #dataSize type: #'size_t'> + <var: #heapBase type: #usqInt> + <var: #desiredHeapSize type: #usqInt> + <var: #headerStart type: #squeakFileOffsetType> + <var: #imageOffset type: #squeakFileOffsetType> - <var: #f type: 'sqImageFile '> - <var: #heapBase type: 'usqInt'> - <var: #desiredHeapSize type: 'usqInt'> - <var: #headerStart type: 'squeakFileOffsetType '> - <var: #dataSize type: 'size_t '> - <var: #imageOffset type: 'squeakFileOffsetType '> metaclassNumSlots := 6. "guess Metaclass instSize" classNameIndex := 6. "guess (Class instVarIndexFor: 'name' ifAbsent: []) - 1" swapBytes := self checkImageVersionFrom: f startingAt: imageOffset. headerStart := (self sqImageFilePosition: f) - BytesPerWord. "record header start position" headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. oldBaseAddr := self getLongFromFile: f swap: swapBytes. objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "N.B. not used." savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n. Can be set as a preference (Info.plist, VM.ini, command line etc). If desiredNumStackPages is already non-zero then it has been set as a preference. Ignore (but preserve) the header's default." numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. It is used for the cog code size in Cog. Preserve it to be polite to other VMs." theUnknownShort := self getShortFromFile: f swap: swapBytes. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "decrease Squeak object heap to leave extra memory for the VM" heapSize := self cCode: 'reserveExtraCHeapBytes(desiredHeapSize, extraVMMemory)'. "compare memory requirements with availability". minimumMemory := dataSize + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes. heapSize < minimumMemory ifTrue: [self insufficientMemorySpecifiedError]. "allocate a contiguous block of memory for the Squeak heap" objectMemory memory: (self allocateMemory: heapSize minimum: minimumMemory imageFile: f headerSize: headerSize) asUnsignedInteger. objectMemory memory = nil ifTrue: [self insufficientMemoryAvailableError]. heapBase := objectMemory memory. objectMemory setHeapBase: heapBase memoryLimit: (heapBase + heapSize) - 24 "decrease memoryLimit a tad for safety" endOfMemory: heapBase + dataSize. "position file after the header" self sqImageFile: f Seek: headerStart + headerSize. "read in the image in bulk, then swap the bytes if necessary" bytesRead := objectMemory readHeapFromImageFile: f dataBytes: dataSize. bytesRead ~= dataSize ifTrue: [self unableToReadImageError]. self ensureImageFormatIsUpToDate: swapBytes. "compute difference between old and new memory base addresses" bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. self initializeInterpreter: bytesToShift. "adjusts all oops to new location" ^dataSize! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPICMissTrampolineFor: (in category 'initialization') ----- genPICMissTrampolineFor: numArgs - | startAddress | - <var: #aString type: #'char *'> <inline: false> + | startAddress | startAddress := methodZoneBase. opcodeIndex := 0. "N.B. a closed PIC jumps to the miss routine, not calls it, so there is only one retpc on the stack." self genPushRegisterArgsForNumArgs: numArgs. self genTrampolineFor: #ceCPICMiss:receiver: called: (self trampolineName: 'cePICMiss' numArgs: (numArgs <= self numRegArgs ifTrue: [numArgs] ifFalse: [-1])) callJumpBar: true numArgs: 2 arg: ClassReg arg: ReceiverResultReg arg: nil arg: nil saveRegs: false resultReg: nil appendOpcodes: true. ^startAddress! Item was changed: ----- Method: StackToRegisterMappingCogit>>genPrimitiveDiv (in category 'primitive generators') ----- genPrimitiveDiv | jumpNotSI jumpZero jumpExact jumpSameSign convert | + <var: #convert type: #'AbstractInstruction *'> - <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpZero type: #'AbstractInstruction *'> + <var: #jumpNotSI type: #'AbstractInstruction *'> <var: #jumpExact type: #'AbstractInstruction *'> <var: #jumpSameSign type: #'AbstractInstruction *'> - <var: #jumpOverflow type: #'AbstractInstruction *'> - <var: #convert type: #'AbstractInstruction *'> self MoveR: Arg0Reg R: TempReg. self MoveR: Arg0Reg R: ClassReg. self MoveR: Arg0Reg R: Arg1Reg. jumpNotSI := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. "We must shift away the tags, not just subtract them, so that the overflow case doesn't actually overflow the machine instruction." objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ClassReg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: ClassReg]. jumpZero := self JumpZero: 0. self MoveR: ReceiverResultReg R: TempReg. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: TempReg. self DivR: ClassReg R: TempReg Quo: TempReg Rem: ClassReg. "If remainder is zero we must check for overflow." self CmpCq: 0 R: ClassReg. jumpExact := self JumpZero: 0. "If arg and remainder signs are different we must round down." self XorR: ClassReg R: Arg1Reg. (self lastOpcode setsConditionCodesFor: JumpZero) ifFalse: [self CmpCq: 0 R: Arg1Reg]. jumpSameSign := self JumpGreaterOrEqual: 0. self SubCq: 1 R: TempReg. jumpSameSign jmpTarget: (convert := self Label). objectRepresentation genConvertIntegerToSmallIntegerInScratchReg: TempReg. self MoveR: TempReg R: ReceiverResultReg. self RetN: 0. "test for overflow; the only case is SmallInteger minVal // -1" jumpExact jmpTarget: (self CmpCq: (1 << (objectRepresentation numSmallIntegerBits - 1)) R: TempReg). self JumpLess: convert. jumpZero jmpTarget: (jumpNotSI jmpTarget: self Label). ^0! Item was changed: ----- Method: TMethod>>harmonizeSignedAndUnsignedTypesIn: (in category 'type inference') ----- harmonizeSignedAndUnsignedTypesIn: aSetOfTypes "Eliminate signed/unsigned conflicts in aSetOfTypes" | sqs usqs | + #(char short int #'unsigned char' #'unsigned short' #'unsigned int') + with: #(sqInt sqInt sqInt #usqInt #usqInt #usqInt) + do: [:type :replacement| + (aSetOfTypes includes: type) ifTrue: + [aSetOfTypes remove: type; add: replacement]]. sqs := aSetOfTypes select: [:t| t beginsWith: 'sq']. usqs := aSetOfTypes select: [:t| t beginsWith: 'usq']. ^(sqs size + usqs size = aSetOfTypes size and: [sqs notEmpty and: [sqs allSatisfy: [:t| usqs includes: 'u', t]]]) ifTrue: [sqs] ifFalse: [aSetOfTypes]! Item was changed: ----- Method: TMethod>>inferReturnTypeFromReturnsIn: (in category 'type inference') ----- inferReturnTypeFromReturnsIn: aCodeGen "Attempt to infer the return type of the receiver from returns in the parse tree." returnType ifNil: "the initial default" [aCodeGen pushScope: declarations while: [| hasReturn returnTypes | hasReturn := false. returnTypes := Set new. parseTree nodesDo: [:node| node isReturn ifTrue: [hasReturn := true. self addTypesFor: node expression to: returnTypes in: aCodeGen]]. returnTypes remove: #implicit ifAbsent: []. returnTypes := self harmonizeSignedAndUnsignedTypesIn: returnTypes. hasReturn ifTrue: [returnTypes size > 1 ifTrue: + [aCodeGen logger show: + (String streamContents: + [:s| + s nextPutAll: 'conflicting return types '. + returnTypes + do: [:t| s nextPutAll: t] + separatedBy: [s nextPutAll: ', ']. + s nextPutAll: ' in '; nextPutAll: selector; cr])]. - [aCodeGen logger nextPutAll: 'conflicting return types', (String streamContents: [:s| returnTypes do: [:t| s space; nextPutAll: t]]), ' in ', selector; cr; flush]. returnTypes size = 1 ifTrue: [self returnType: returnTypes anyOne]] ifFalse: [self returnType: (aCodeGen implicitReturnTypeFor: selector)]]]! Item was changed: ----- Method: TReturnNode>>emitCCodeOn:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream level: level generator: aCodeGen (expression isSwitch or: [expression isCaseStmt]) ifTrue: [^expression emitCCodeOn: aStream addToEndOfCases: self level: level generator: aCodeGen]. ('void' = aCodeGen currentMethod returnType) ifTrue: [ "If the function is void, don't say 'return x' instead say ' x; return' " expression isLeaf ifFalse: [ expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen. + aStream nextPut: $;; crtab: level. - aStream nextPutAll: ';'; space. ]. aStream nextPutAll: 'return'. ] ifFalse: [ aStream nextPutAll: 'return'. aStream space. expression emitCCodeAsArgumentOn: aStream level: level generator: aCodeGen ].!

1 0

VM Maker: VMMaker.oscog-eem.491.mcz
by commits＠source.squeak.org 02 Nov '13

02 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.491.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.491 Author: eem Time: 1 November 2013, 1:43:38.082 pm UUID: e480c63b-0653-4b07-97bb-82eff9db8854 Ancestors: VMMaker.oscog-eem.490 Fix roomToPushNArgs:; the Cog VMs can be more lenient because of the use of a stack instead of contexts. Simplify primitiveDoNamedPrimitiveWithArgs. Add missing NewObjectMemory>>badContextSize: so that the VM doesn't use SmallContextSize. Integrate VMMaker-dtl.328. Integrate Nice's improved SmallInteger generated primitives that support int x float comparison. Fix compactCompiledCode: for simulation. Slang: Do not generate dead code by default. Fix the trailing ; issue for some sends. =============== Diff against VMMaker.oscog-eem.490 =============== Item was changed: ----- Method: BitBltSimulation>>primitiveDisplayString (in category 'primitives') ----- primitiveDisplayString | kernDelta xTable glyphMap stopIndex startIndex sourceString bbObj maxGlyph ascii glyphIndex sourcePtr left quickBlt | <export: true> <var: #sourcePtr type: 'char *'> interpreterProxy methodArgumentCount = 6 ifFalse:[^interpreterProxy primitiveFail]. kernDelta := interpreterProxy stackIntegerValue: 0. xTable := interpreterProxy stackObjectValue: 1. glyphMap := interpreterProxy stackObjectValue: 2. ((interpreterProxy fetchClassOf: xTable) = interpreterProxy classArray and:[ (interpreterProxy fetchClassOf: glyphMap) = interpreterProxy classArray]) ifFalse:[^interpreterProxy primitiveFail]. (interpreterProxy slotSizeOf: glyphMap) = 256 ifFalse:[^interpreterProxy primitiveFail]. interpreterProxy failed ifTrue:[^nil]. maxGlyph := (interpreterProxy slotSizeOf: xTable) - 2. stopIndex := interpreterProxy stackIntegerValue: 3. startIndex := interpreterProxy stackIntegerValue: 4. sourceString := interpreterProxy stackObjectValue: 5. (interpreterProxy isBytes: sourceString) ifFalse:[^interpreterProxy primitiveFail]. (startIndex > 0 and:[stopIndex > 0 and:[ stopIndex <= (interpreterProxy byteSizeOf: sourceString)]]) ifFalse:[^interpreterProxy primitiveFail]. bbObj := interpreterProxy stackObjectValue: 6. (self loadBitBltFrom: bbObj) ifFalse:[^interpreterProxy primitiveFail]. (combinationRule = 30 or:[combinationRule = 31]) "needs extra source alpha" ifTrue:[^interpreterProxy primitiveFail]. "See if we can go directly into copyLoopPixMap (usually we can)" quickBlt := destBits ~= 0 "no OS surfaces please" and:[sourceBits ~= 0 "and again" and:[noSource = false "needs a source" and:[sourceForm ~= destForm "no blits onto self" and:[(cmFlags ~= 0 or:[sourceMSB ~= destMSB or:[sourceDepth ~= destDepth]]) "no point using slower version" ]]]]. left := destX. sourcePtr := interpreterProxy firstIndexableField: sourceString. startIndex to: stopIndex do:[:charIndex| ascii := interpreterProxy byteAtPointer: sourcePtr + charIndex - 1. glyphIndex := interpreterProxy fetchInteger: ascii ofObject: glyphMap. (glyphIndex < 0 or:[glyphIndex > maxGlyph]) ifTrue:[^interpreterProxy primitiveFail]. sourceX := interpreterProxy fetchInteger: glyphIndex ofObject: xTable. width := (interpreterProxy fetchInteger: glyphIndex+1 ofObject: xTable) - sourceX. interpreterProxy failed ifTrue:[^nil]. self clipRange. "Must clip here" (bbW > 0 and:[bbH > 0]) ifTrue: [ quickBlt ifTrue:[ self destMaskAndPointerInit. self copyLoopPixMap. "both, hDir and vDir are known to be > 0" affectedL := dx. affectedR := dx + bbW. affectedT := dy. affectedB := dy + bbH. ] ifFalse:[self copyBits]]. interpreterProxy failed ifTrue:[^nil]. destX := destX + width + kernDelta. ]. affectedL := left. self showDisplayBits. + "store destX back" + interpreterProxy storeInteger: BBDestXIndex ofObject: bbObj withValue: destX. interpreterProxy pop: 6. "pop args, return rcvr"! Item was changed: ----- Method: CCodeGenerator>>vmClass: (in category 'accessing') ----- vmClass: aClass + "Set the main translation class if any. This is nil other than for the core VM. + It may be an interpreter or a cogit" + vmClass := aClass. + vmClass ifNotNil: + [generateDeadCode := vmClass shouldGenerateDeadCode]! - "Set the interpreter class if any. This is nil other than for the core VM." - vmClass := aClass! Item was changed: ----- Method: CoInterpreter>>roomToPushNArgs: (in category 'primitive support') ----- roomToPushNArgs: n + "Answer if there is room to push n arguments onto the current stack. We assume + this is called by primitives that check there is enough room in any new context, and + won't actually push the arguments in the current context if the primitive fails. With + this assumption it is safe to answer based on the maximum argument count, /not/ + the ammount of space in the current frame were it converted to a context.." + false + ifTrue: "old code that checked size of context..." + [| methodHeader cntxSize | + (self isMachineCodeFrame: framePointer) + ifTrue: [methodHeader := (self mframeHomeMethod: framePointer) methodHeader] + ifFalse: [methodHeader := self headerOf: (self iframeMethod: framePointer)]. + cntxSize := (methodHeader bitAnd: LargeContextBit) ~= 0 + ifTrue: [LargeContextSlots - CtxtTempFrameStart] + ifFalse: [SmallContextSlots - CtxtTempFrameStart]. + ^self stackPointerIndex + n <= cntxSize] + ifFalse: "simpler code that simply insists args are <= max arg count" + [^n <= (LargeContextSlots - CtxtTempFrameStart)]! - "Answer if there is room to push n arguments onto the current stack. - There may be room in this stackPage but there may not be room if - the frame were converted into a context." - | methodHeader cntxSize | - (self isMachineCodeFrame: framePointer) - ifTrue: [methodHeader := (self mframeHomeMethod: framePointer) methodHeader] - ifFalse: [methodHeader := self headerOf: (self iframeMethod: framePointer)]. - cntxSize := (methodHeader bitAnd: LargeContextBit) ~= 0 - ifTrue: [LargeContextSlots - ReceiverIndex] - ifFalse: [SmallContextSlots - ReceiverIndex]. - ^self stackPointerIndex + n <= cntxSize! Item was changed: ----- Method: CogMethodZone>>compactCompiledCode: (in category 'compaction') ----- compactCompiledCode: objectHeaderValue | source dest bytes | <var: #source type: #'CogMethod *'> <var: #dest type: #'CogMethod *'> source := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. openPICList := nil. methodCount := 0. self cppIf: NewspeakVM ifTrue: [unpairedMethodList := nil]. [source < self limitZony and: [source cmType ~= CMFree]] whileTrue: [self assert: (cogit cogMethodDoesntLookKosher: source) = 0. source objectHeader: objectHeaderValue. source cmUsageCount > 0 ifTrue: [source cmUsageCount: source cmUsageCount // 2]. self cppIf: NewspeakVM ifTrue: [(source cmType = CMMethod and: [(coInterpreter rawHeaderOf: source methodObject) asInteger ~= source asInteger]) ifTrue: [source nextMethod: unpairedMethodList. unpairedMethodList := source]]. source cmType = CMOpenPIC ifTrue: [source nextOpenPIC: openPICList asUnsignedInteger. openPICList := source]. methodCount := methodCount + 1. source := self methodAfter: source]. source >= self limitZony ifTrue: [^self halt: 'no free methods; cannot compact.']. dest := source. [source < self limitZony] whileTrue: [self assert: (cogit maybeFreeCogMethodDoesntLookKosher: source) = 0. bytes := source blockSize. source cmType ~= CMFree ifTrue: [methodCount := methodCount + 1. + objectMemory mem: dest mo: source ve: bytes. - self mem: dest mo: source ve: bytes. dest objectHeader: objectHeaderValue. dest cmType = CMMethod ifTrue: ["For non-Newspeak there should be a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only update the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger ifTrue: [coInterpreter rawHeaderOf: dest methodObject put: dest asInteger] ifFalse: [self assert: (cogit noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject. self cppIf: NewspeakVM ifTrue: [dest nextMethod: unpairedMethodList. unpairedMethodList := dest]]] ifFalse: [dest cmType = CMOpenPIC ifTrue: [dest nextOpenPIC: openPICList asUnsignedInteger. openPICList := dest]]. dest cmUsageCount > 0 ifTrue: [dest cmUsageCount: dest cmUsageCount // 2]. dest := coInterpreter cCoerceSimple: dest asUnsignedInteger + bytes to: #'CogMethod *']. source := coInterpreter cCoerceSimple: source asUnsignedInteger + bytes to: #'CogMethod *']. mzFreeStart := dest asUnsignedInteger. methodBytesFreedSinceLastCompaction := 0! Item was added: + ----- Method: NewObjectMemory>>badContextSize: (in category 'contexts') ----- + badContextSize: oop + | numSlots | + numSlots := self numSlotsOf: oop. + ^numSlots ~= SmallContextSlots and: [numSlots ~= LargeContextSlots]! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveEqual (in category 'primitive generators') ----- genPrimitiveEqual + ^self genSmallIntegerComparison: JumpZero orDoubleComparison: #JumpFPEqual: asSymbol! - ^self genSmallIntegerComparison: JumpZero! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveGreaterOrEqual (in category 'primitive generators') ----- genPrimitiveGreaterOrEqual + ^self genSmallIntegerComparison: JumpGreaterOrEqual orDoubleComparison: #JumpFPGreaterOrEqual: asSymbol! - ^self genSmallIntegerComparison: JumpGreaterOrEqual! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveGreaterThan (in category 'primitive generators') ----- genPrimitiveGreaterThan + ^self genSmallIntegerComparison: JumpGreater orDoubleComparison: #JumpFPGreater: asSymbol! - ^self genSmallIntegerComparison: JumpGreater! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveLessOrEqual (in category 'primitive generators') ----- genPrimitiveLessOrEqual + ^self genSmallIntegerComparison: JumpLessOrEqual orDoubleComparison: #JumpFPLessOrEqual: asSymbol! - ^self genSmallIntegerComparison: JumpLessOrEqual! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveLessThan (in category 'primitive generators') ----- genPrimitiveLessThan + ^self genSmallIntegerComparison: JumpLess orDoubleComparison: #JumpFPLess: asSymbol! - ^self genSmallIntegerComparison: JumpLess! Item was changed: ----- Method: SimpleStackBasedCogit>>genPrimitiveNotEqual (in category 'primitive generators') ----- genPrimitiveNotEqual + ^self genSmallIntegerComparison: JumpNonZero orDoubleComparison: #JumpFPNotEqual: asSymbol! - ^self genSmallIntegerComparison: JumpNonZero! Item was added: + ----- Method: SimpleStackBasedCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- + genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator + "Stack looks like + receiver (also in ResultReceiverReg) + arg + return address" + | jumpDouble jumpFail jumpTrue jumpCond | + <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> + <var: #jumpDouble type: #'AbstractInstruction *'> + <var: #jumpFail type: #'AbstractInstruction *'> + <var: #jumpTrue type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> + self MoveMw: BytesPerWord r: SPReg R: TempReg. + self MoveR: TempReg R: ClassReg. + jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. + self CmpR: ClassReg R: ReceiverResultReg. "N.B. FLAGS := RRReg - ClassReg" + jumpTrue := self gen: jumpOpcode. + self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) + objRef: objectMemory falseObject. + self flag: 'currently caller pushes result'. + self RetN: BytesPerWord * 2. + jumpTrue jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) + objRef: objectMemory trueObject). + self RetN: BytesPerWord * 2. + + "Argument may be a Float : let us check or fail" + jumpDouble jmpTarget: self Label. + objectRepresentation genGetCompactClassIndexNonImmOf: ClassReg into: SendNumArgsReg. + self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. + jumpFail := self JumpNonZero: 0. + + "It was a Float, so convert the receiver to double and perform the operation" + self MoveR: ReceiverResultReg R: TempReg. + objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: TempReg. + self ConvertR: TempReg Rd: DPFPReg0. + objectRepresentation genGetDoubleValueOf: ClassReg into: DPFPReg1. + self CmpRd: DPFPReg1 Rd: DPFPReg0. + jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" + self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) + objRef: objectMemory falseObject. + self flag: 'currently caller pushes result'. + self RetN: BytesPerWord * 2. + jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) + objRef: objectMemory trueObject). + self RetN: BytesPerWord * 2. + + jumpFail jmpTarget: self Label. + ^0! Item was changed: ----- Method: StackInterpreter class>>initializeContextIndices (in category 'initialization') ----- initializeContextIndices "Class MethodContext" SenderIndex := 0. InstructionPointerIndex := 1. StackPointerIndex := 2. MethodIndex := 3. ClosureIndex := 4. "N.B. Called receiverMap in old images, closureOrNil in newer images." ReceiverIndex := 5. CtxtTempFrameStart := 6. SmallContextSlots := CtxtTempFrameStart + 16. "16 indexable fields" "Large contexts have 56 indexable fields. Max with single header word of ObjectMemory [but not SpurMemoryManager ;-)]." LargeContextSlots := CtxtTempFrameStart + 56. "Including the header size in these sizes is problematic for multiple memory managers, + so we don't use them, except LargeContextSize for asserts. Set small to #bogus for error checking." + SmallContextSize := #bogus. + LargeContextSize := LargeContextSlots * BytesPerOop + BaseHeaderSize. - so we don't use them, except LargeContextSize for asserts. Set small to nil for error checking." - SmallContextSize := nil. - LargeContextSize := LargeContextSlots + 1 * BytesPerOop. "Class BlockClosure" ClosureOuterContextIndex := 0. ClosureStartPCIndex := 1. ClosureNumArgsIndex := 2. ClosureFirstCopiedValueIndex := 3. ClosureCopiedValuesIndex := 3! Item was changed: ----- Method: StackInterpreter>>roomToPushNArgs: (in category 'primitive support') ----- roomToPushNArgs: n + "Answer if there is room to push n arguments onto the current stack. We assume + this is called by primitives that check there is enough room in any new context, and + won't actually push the arguments in the current context if the primitive fails. With + this assumption it is safe to answer based on the maximum argument count, /not/ + the ammount of space in the current frame were it converted to a context.." + false + ifTrue: "old code that checked size of context..." + [| cntxSize | + self assert: method = (stackPages longAt: framePointer + FoxMethod). + cntxSize := ((self headerOf: method) bitAnd: LargeContextBit) ~= 0 + ifTrue: [LargeContextSlots - CtxtTempFrameStart] + ifFalse: [SmallContextSlots - CtxtTempFrameStart]. + ^self stackPointerIndex + n <= cntxSize] + ifFalse: "simpler code that simply insists args are <= max arg count" + [^n <= (LargeContextSlots - CtxtTempFrameStart)]! - "Answer if there is room to push n arguments onto the current stack. - There may be room in this stackPage but there may not be room if - the frame were converted into a context." - | cntxSize | - self assert: method = (stackPages longAt: framePointer + FoxMethod). - cntxSize := ((self headerOf: method) bitAnd: LargeContextBit) ~= 0 - ifTrue: [LargeContextSlots - ReceiverIndex] - ifFalse: [SmallContextSlots - ReceiverIndex]. - ^self stackPointerIndex + n <= cntxSize! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveDoNamedPrimitiveWithArgs (in category 'plugin primitives') ----- primitiveDoNamedPrimitiveWithArgs "Simulate an primitiveExternalCall invocation (e.g. for the Debugger). Do not cache anything. e.g. ContextPart>>tryNamedPrimitiveIn: aCompiledMethod for: aReceiver withArgs: arguments" | argumentArray arraySize methodArg methodHeader moduleName functionName moduleLength functionLength spec addr primRcvr ctxtRcvr isArray | <var: #addr declareC: 'void (*addr)()'> argumentArray := self stackTop. + methodArg := self stackValue: 2. + ((objectMemory isArray: argumentArray) + and: [objectMemory isOopCompiledMethod: methodArg]) ifFalse: - (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFailFor: -2]. "invalid args" arraySize := objectMemory fetchWordLengthOf: argumentArray. + (self roomToPushNArgs: arraySize) ifFalse: - self success: (self roomToPushNArgs: arraySize). - - methodArg := self stackObjectValue: 2. - self successful ifFalse: [^self primitiveFailFor: -2]. "invalid args" - (objectMemory isOopCompiledMethod: methodArg) ifFalse: - [^self primitiveFailFor: -2]. "invalid args" - methodHeader := self headerOf: methodArg. - (self literalCountOfHeader: methodHeader) > 2 ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" spec := objectMemory fetchPointer: 1 "first literal" ofObject: methodArg. isArray := self isInstanceOfClassArray: spec. (isArray and: [(objectMemory lengthOf: spec) = 4 and: [(self primitiveIndexOfMethod: methodArg header: methodHeader) = 117]]) ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" (self argumentCountOfMethodHeader: methodHeader) = arraySize ifFalse: [^self primitiveFailFor: -2]. "invalid args (Array args wrong size)" "The function has not been loaded yet. Fetch module and function name." moduleName := objectMemory fetchPointer: 0 ofObject: spec. moduleName = objectMemory nilObject ifTrue: [moduleLength := 0] ifFalse: [self success: (objectMemory isBytes: moduleName). moduleLength := objectMemory lengthOf: moduleName. self cCode: '' inSmalltalk: [ (#('FloatArrayPlugin' 'Matrix2x3Plugin') includes: (self stringOf: moduleName)) "??" ifTrue: [moduleLength := 0 "Cause all of these to fail"]]]. functionName := objectMemory fetchPointer: 1 ofObject: spec. self success: (objectMemory isBytes: functionName). functionLength := objectMemory lengthOf: functionName. self successful ifFalse: [^self primitiveFailFor: -3]. "invalid methodArg state" addr := self ioLoadExternalFunction: functionName + BaseHeaderSize OfLength: functionLength FromModule: moduleName + BaseHeaderSize OfLength: moduleLength. addr = 0 ifTrue: [^self primitiveFailFor: -1]. "could not find function; answer generic failure (see below)" "Cannot fail this primitive from now on. Can only fail the external primitive." objectMemory pushRemappableOop: (argumentArray := self popStack). objectMemory pushRemappableOop: (primRcvr := self popStack). objectMemory pushRemappableOop: self popStack. "the method" objectMemory pushRemappableOop: self popStack. "the context receiver" self push: primRcvr. "replace context receiver with actual receiver" argumentCount := arraySize. 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. self callExternalPrimitive: addr. ctxtRcvr := objectMemory popRemappableOop. methodArg := objectMemory popRemappableOop. primRcvr := objectMemory popRemappableOop. argumentArray := objectMemory popRemappableOop. self successful ifFalse: "If primitive failed, then restore state for failure code" [self pop: arraySize + 1. self push: ctxtRcvr. self push: methodArg. self push: primRcvr. self push: argumentArray. argumentCount := 3. "Hack. A nil prim error code (primErrorCode = 1) is interpreted by the image as meaning this primitive is not implemented. So to pass back nil as an error code we use -1 to indicate generic failure." primFailCode = 1 ifTrue: [primFailCode := -1]]! Item was added: + ----- Method: StackToRegisterMappingCogit>>genSmallIntegerComparison:orDoubleComparison: (in category 'primitive generators') ----- + genSmallIntegerComparison: jumpOpcode orDoubleComparison: jumpFPOpcodeGenerator + "Stack looks like + return address" + | jumpDouble jumpFail jumpTrue jumpCond | + <var: #jumpFPOpcodeGenerator declareC: 'AbstractInstruction *(*jumpFPOpcodeGenerator)(void *)'> + <var: #jumpDouble type: #'AbstractInstruction *'> + <var: #jumpFail type: #'AbstractInstruction *'> + <var: #jumpTrue type: #'AbstractInstruction *'> + <var: #jumpCond type: #'AbstractInstruction *'> + self MoveR: Arg0Reg R: TempReg. + jumpDouble := objectRepresentation genJumpNotSmallIntegerInScratchReg: TempReg. + self CmpR: Arg0Reg R: ReceiverResultReg. "N.B. FLAGS := RRReg - Arg0Reg" + jumpTrue := self gen: jumpOpcode. + self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) + objRef: objectMemory falseObject. + self RetN: 0. + jumpTrue jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) + objRef: objectMemory trueObject). + self RetN: 0. + + "Argument may be a Float : let us check or fail" + jumpDouble jmpTarget: self Label. + objectRepresentation genGetCompactClassIndexNonImmOf: Arg0Reg into: SendNumArgsReg. + self CmpCq: objectMemory classFloatCompactIndex R: SendNumArgsReg. + jumpFail := self JumpNonZero: 0. + + "It was a Float, so convert the receiver to double and perform the operation" + objectRepresentation genConvertSmallIntegerToIntegerInScratchReg: ReceiverResultReg. + self ConvertR: ReceiverResultReg Rd: DPFPReg0. + objectRepresentation genGetDoubleValueOf: Arg0Reg into: DPFPReg1. + self CmpRd: DPFPReg1 Rd: DPFPReg0. + jumpCond := self perform: jumpFPOpcodeGenerator with: 0. "FP jumps are a little weird" + self annotate: (self MoveCw: objectMemory falseObject R: ReceiverResultReg) + objRef: objectMemory falseObject. + self RetN: 0. + jumpCond jmpTarget: (self annotate: (self MoveCw: objectMemory trueObject R: ReceiverResultReg) + objRef: objectMemory trueObject). + self RetN: 0. + jumpFail jmpTarget: self Label. + ^0! Item was changed: ----- Method: TStmtListNode>>emitCCodeOn:prependToEnd:level:generator: (in category 'C code generation') ----- emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level generator: aCodeGen self emitCCommentOn: aStream level: level. statements withIndexDo: [:s :idx| s emitCCommentOn: aStream level: level. aStream peekLast ~~ Character tab ifTrue: [aStream tab: level]. (aNodeOrNil notNil and: [idx = statements size]) ifTrue: [s emitCCodeOn: aStream prependToEnd: aNodeOrNil level: level generator: aCodeGen] ifFalse: [s emitCCodeOn: aStream level: level generator: aCodeGen]. + (self stream: aStream endsWithAnyOf: '};') ifFalse: - (self endsWithCloseBracket: aStream) ifFalse: [s needsTrailingSemicolon ifTrue: [aStream nextPut: $;]]. aStream cr]. ! Item was added: + ----- Method: TStmtListNode>>stream:endsWithAnyOf: (in category 'testing') ----- + stream: aStream endsWithAnyOf: characters + "Answer if the given stream ends in any of the characters, ignoring whitespace." + | pos ch popped | + pos := aStream position. + aStream class = WriteStream ifTrue: "i.e. nested in StreamContents" + [[pos > 0] whileTrue: + [ch := aStream originalContents at: pos. + ch isSeparator ifFalse: + [^characters includes: ch]. + pos := pos - 1]. + ^false]. + + popped := OrderedCollection new. + [pos > 0] whileTrue: + [ch := popped addFirst: (aStream position: pos - 1; peek). + ch isSeparator ifFalse: + [aStream nextPutAll: popped. + ^characters includes: ch]. + pos := pos - 1]. + aStream nextPutAll: popped. + ^false! Item was added: + ----- Method: VMClass class>>shouldGenerateDeadCode (in category 'translation') ----- + shouldGenerateDeadCode + "Answer if the code generator should generate dead code, e.g. in false ifTrue: [dead] ifFalse: [live]. + This *may* be useful in debugging (see CCodeGenerator>>nilOrBooleanConstantReceiverOf: et al). + But by default we answer false." + + ^false! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.7.0 (Cog)'! - ^'4.6.0 (Cog)'!

1 0

VM Maker: VMMaker.oscog-eem.491.mcz
by commits＠source.squeak.org 01 Nov '13

01 Nov '13

1 0

source.squeak.org is veeerrrrryyy slooooow
by Eliot Miranda 01 Nov '13

01 Nov '13

so much so that I can't upload two new versions. what to do? -- best, Eliot

3 3

VM Maker: VMMaker.oscog-eem.490.mcz
by commits＠source.squeak.org 01 Nov '13

01 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.490.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.490 Author: eem Time: 1 November 2013, 11:06:19.76 am UUID: 7355becb-538e-4ed9-b13e-adc433688443 Ancestors: VMMaker.oscog-eem.489 Remember to free untraced stack pages after the mark phase. Include flag bits in SpurMemMgr>>printHeaderTypeOf:. Fix longPrintOop: to print string contents. Fix return type conflicts in commonAt: et al. Fix printActivationNameFor:receiver:isBlock:firstTemporary: for no method class (which can be reported as nilObj), and nuke unused printActivationNameForMethod:startClass:isBlock:firstTemporary:. =============== Diff against VMMaker.oscog-eem.489 =============== Item was changed: ----- Method: CCodeGenerator>>localizeGlobalVariables (in category 'utilities') ----- localizeGlobalVariables + | candidates elected localized | - | candidates elected | "find all globals used in only one method" candidates := globalVariableUsage select: [:e | e size = 1]. (candidates keys select: [:k| vmClass mustBeGlobal: k]) do: [:k| candidates removeKey: k]. elected := Set new. + localized := Dictionary new. "for an ordered report" - "move any suitable global to be local to the single method using it" candidates keysAndValuesDo: [:key :targets | targets do: [:name | | procedure newDeclaration | procedure := methods at: name. procedure isRealMethod ifTrue: + [(localized at: name ifAbsentPut: [SortedCollection new]) add: key. - [logger notNil ifTrue: - [logger ensureCr; show: key, ' localised to ', name; cr]. elected add: (procedure locals add: key). newDeclaration := variableDeclarations at: key ifAbsent: ['sqInt ', key]. + (self initializerForInstVar: key inStartClass: procedure definingClass) ifNotNil: - (self initializerForInstVar: key inStartClass: (methods at: name) definingClass) ifNotNil: [:initializerNode| newDeclaration := String streamContents: [:s| s nextPutAll: newDeclaration; nextPutAll: ' = '. initializerNode emitCCodeOn: s level: 0 generator: self]]. procedure declarationAt: key put: newDeclaration. variableDeclarations removeKey: key ifAbsent: []]]]. + logger ifNotNil: + [localized keys asSortedCollection do: + [:name| + (localized at: name) do: + [:var| + logger ensureCr; show: var, ' localised to ', name; cr]]]. elected do: [:ea| (variables includes: ea) ifTrue: [self checkDeleteVariable: ea]]. variables removeAllFoundIn: elected! Item was changed: ----- Method: SpurMemoryManager>>markWeaklingsAndMarkAndFireEphemerons (in category 'gc - global') ----- markWeaklingsAndMarkAndFireEphemerons "After the initial scan-mark is complete ephemerons can be processed. Weaklings have accumulated on the weaklingStack, but more may be uncovered during ephemeron processing. So trace the strong slots of the weaklings, and as ephemerons are processed ensure any newly reached weaklings are also traced." | numTracedWeaklings | <inline: false> numTracedWeaklings := 0. [coInterpreter markAndTraceUntracedReachableStackPages. numTracedWeaklings := self markAndTraceWeaklingsFrom: numTracedWeaklings. self noUnscannedEphemerons ifTrue: + [coInterpreter + markAndTraceUntracedReachableStackPages; + freeUntracedStackPages. + ^self]. - [^self]. self markInactiveEphemerons ifFalse: [self fireAllUnscannedEphemerons]. self markAllUnscannedEphemerons] repeat! Item was changed: ----- Method: SpurMemoryManager>>printHeaderTypeOf: (in category 'debug printing') ----- printHeaderTypeOf: objOop + coInterpreter + print: ((self numSlotsOf: objOop) >= self numSlotsMask + ifTrue: [' hdr16 '] + ifFalse: [' hdr8 ']); + printChar: ((self isImmutable: objOop) ifTrue: [$i] ifFalse: [$.]); + printChar: ((self isRemembered: objOop) ifTrue: [$r] ifFalse: [$.]); + printChar: ((self isPinned: objOop) ifTrue: [$p] ifFalse: [$.]); + printChar: ((self isMarked: objOop) ifTrue: [$m] ifFalse: [$.]); + printChar: ((self isGrey: objOop) ifTrue: [$g] ifFalse: [$.])! - coInterpreter print: ((self numSlotsOf: objOop) >= self numSlotsMask - ifTrue: [' 16 byte header'] - ifFalse: [' 8 byte header'])! Item was changed: ----- Method: StackInterpreter>>commonAt: (in category 'indexing primitive support') ----- commonAt: stringy "This code is called if the receiver responds primitively to at:. N.B. this does *not* use the at cache, instead inlining stObject:at:. Using the at cache here would require that callers set messageSelector and lkupClass and that is onerous and error-prone, and in any case, inlining produces much better performance than using the at cache here." | index rcvr result | <inline: true> "to get it inlined in primitiveAt and primitiveStringAt" self initPrimCall. rcvr := self stackValue: 1. (objectMemory isImmediate: rcvr) ifTrue: [^self primitiveFailFor: PrimErrInappropriate]. index := self stackTop. "No need to test for large positive integers here. No object has 1g elements" (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. index := objectMemory integerValueOf: index. result := self stObject: rcvr at: index. self successful ifTrue: [stringy ifTrue: [result := self characterForAscii: (objectMemory integerValueOf: result)]. + self pop: argumentCount+1 thenPush: result]! - ^self pop: argumentCount+1 thenPush: result]! Item was changed: ----- Method: StackInterpreter>>commonAtPut: (in category 'indexing primitive support') ----- commonAtPut: stringy "This code is called if the receiver responds primitively to at:Put:. N.B. this does *not* use the at cache, instead inlining stObject:at:put:. Using the at cache here would require that callers set messageSelector and lkupClass and that is onerous and error-prone, and in any case, inlining produces much better performance than using the at cache here." | value index rcvr | <inline: true> "to get it inlined in primitiveAtPut and primitiveStringAtPut" value := self stackTop. self initPrimCall. rcvr := self stackValue: 2. (objectMemory isNonImmediate: rcvr) ifFalse: [^self primitiveFailFor: PrimErrInappropriate]. index := self stackValue: 1. "No need to test for large positive integers here. No object has 1g elements" (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. index := objectMemory integerValueOf: index. stringy ifTrue: [self stObject: rcvr at: index put: (self asciiOfCharacter: value)] ifFalse: [self stObject: rcvr at: index put: value]. self successful ifTrue: + [self pop: argumentCount+1 thenPush: value]! - [^self pop: argumentCount+1 thenPush: value]! Item was changed: ----- Method: StackInterpreter>>commonCallerReturn (in category 'return bytecodes') ----- commonCallerReturn "Return to the previous context/frame (sender for method activations, caller for block activations)." <sharedCodeNamed: 'commonCallerReturn' inCase: #returnTopFromBlock> | callersFPOrNull | <var: #callersFPOrNull type: #'char *'> callersFPOrNull := self frameCallerFP: localFP. callersFPOrNull == 0 "baseFrame" ifTrue: [self assert: localFP = stackPage baseFP. ^self baseFrameReturn]. localIP := self frameCallerSavedIP: localFP. localSP := localFP + (self frameStackedReceiverOffset: localFP). localFP := callersFPOrNull. self setMethod: (self frameMethod: localFP). self fetchNextBytecode. + self internalStackTopPut: localReturnValue! - ^self internalStackTopPut: localReturnValue! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | fmt lastIndex startIP bytecodesPerLine column | ((objectMemory isImmediate: oop) or: [(objectMemory addressCouldBeObj: oop) not or: [(oop bitAnd: objectMemory allocationUnit - 1) ~= 0 or: [(objectMemory isFreeObject: oop) or: [objectMemory isForwarded: oop]]]]) ifTrue: [self printOop: oop. ^self]. self printHex: oop. (objectMemory fetchClassOfNonImm: oop) ifNil: [self print: ' has a nil class!!!!'] ifNotNil: [:class| self print: ': a(n) '; printNameOfClass: class count: 5; print: ' ('; printHex: class; print: ')']. fmt := objectMemory formatOf: oop. self print: ' format '; printHexnp: fmt. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory byteLengthOf: oop)] ifFalse: [(objectMemory isIndexableFormat: fmt) ifTrue: [| len | len := objectMemory lengthOf: oop. self print: ' size '; printNum: len - (objectMemory fixedFieldsOf: oop format: fmt length: len)]]. objectMemory printHeaderTypeOf: oop. self print: ' hash '; printHexnp: (objectMemory rawHashBitsOf: oop). self cr. + (fmt between: objectMemory firstByteFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: + [^self printStringOf: oop; cr]. + (fmt between: objectMemory firstLongFormat and: objectMemory firstByteFormat - 1) ifTrue: - (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: [^self]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + BytesPerOop - objectMemory baseHeaderSize / BytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:i| | fieldOop | fieldOop := objectMemory fetchPointer: i - 1 ofObject: oop. self space; printNum: i - 1; space; printHex: fieldOop; space. (i = 1 and: [objectMemory isCompiledMethod: oop]) ifTrue: [self printMethodHeaderOop: fieldOop] ifFalse: [self cCode: [self printOopShort: fieldOop] inSmalltalk: [self print: (self shortPrint: fieldOop)]]. self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * BytesPerWord + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08x: ", oop+BaseHeaderSize+index-1)' inSmalltalk: [self print: (oop+BaseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>primitiveEventProcessingControl (in category 'I/O primitives') ----- primitiveEventProcessingControl "With 0 args answers whether ioProcessEvents is enabled and being called. With 1 arg expects a boolean which will enable ioProcessEvents if true and disable it if false, answering its previous state." <export: true> | enabled | enabled := inIOProcessEvents >= 0. argumentCount = 0 ifTrue: [^self pop: 1 thenPushBool: enabled]. argumentCount = 1 ifTrue: [self stackTop = objectMemory trueObject ifTrue: [inIOProcessEvents < 0 ifTrue: [inIOProcessEvents := 0]] ifFalse: [self stackTop = objectMemory falseObject ifTrue: [inIOProcessEvents := -1] + ifFalse: [self primitiveFailFor: PrimErrBadArgument. + ^self]]. - ifFalse: [^self primitiveFailFor: PrimErrBadArgument]]. ^self pop: 2 thenPushBool: enabled]. self primitiveFailFor: PrimErrBadNumArgs! Item was changed: ----- Method: StackInterpreter>>printActivationNameFor:receiver:isBlock:firstTemporary: (in category 'debug printing') ----- printActivationNameFor: aMethod receiver: anObject isBlock: isBlock firstTemporary: maybeMessage | methClass methodSel classObj | <inline: false> isBlock ifTrue: [self print: '[] in ']. methClass := self findClassOfMethod: aMethod forReceiver: anObject. methodSel := self findSelectorOfMethod: aMethod. ((objectMemory addressCouldBeOop: anObject) and: [(objectMemory isOopForwarded: anObject) not and: [self addressCouldBeClassObj: (classObj := objectMemory fetchClassOf: anObject)]]) ifTrue: + [(classObj = methClass or: [methClass isNil or: [methClass = objectMemory nilObject] "i.e. doits"]) - [(classObj = methClass or: [methClass isNil "i.e. doits"]) ifTrue: [self printNameOfClass: classObj count: 5] ifFalse: [self printNameOfClass: classObj count: 5. self print: '('. self printNameOfClass: methClass count: 5. self print: ')']] ifFalse: [self cCode: '' inSmalltalk: [self halt]. self print: 'INVALID RECEIVER']. self print: '>'. (objectMemory addressCouldBeOop: methodSel) ifTrue: [methodSel = objectMemory nilObject + ifTrue: [self print: '(nil)'] - ifTrue: [self print: '?'] ifFalse: [self printStringOf: methodSel]] ifFalse: [self print: 'INVALID SELECTOR']. (methodSel = (objectMemory splObj: SelectorDoesNotUnderstand) and: [(objectMemory addressCouldBeObj: maybeMessage) and: [(objectMemory fetchClassOfNonImm: maybeMessage) = (objectMemory splObj: ClassMessage)]]) ifTrue: ["print arg message selector" methodSel := objectMemory fetchPointer: MessageSelectorIndex ofObject: maybeMessage. self print: ' '. self printStringOf: methodSel]! Item was removed: - ----- Method: StackInterpreter>>printActivationNameForMethod:startClass:isBlock:firstTemporary: (in category 'debug printing') ----- - printActivationNameForMethod: aMethod startClass: startClass isBlock: isBlock firstTemporary: maybeMessage - | methClass methodSel | - <inline: false> - isBlock ifTrue: - [self print: '[] in ']. - self findSelectorAndClassForMethod: aMethod - lookupClass: startClass - do: [:sel :class| - methodSel := sel. - methClass := class]. - ((self addressCouldBeOop: startClass) and: [methClass notNil]) - ifTrue: - [startClass = methClass - ifTrue: [self printNameOfClass: methClass count: 5] - ifFalse: - [self printNameOfClass: startClass count: 5. - self printChar: $(. - self printNameOfClass: methClass count: 5. - self printChar: $)]] - ifFalse: [self print: 'INVALID CLASS']. - self printChar: $>. - (objectMemory addressCouldBeOop: methodSel) - ifTrue: - [(objectMemory isBytes: methodSel) - ifTrue: [self printStringOf: methodSel] - ifFalse: [self printOopShort: methodSel]] - ifFalse: [self print: 'INVALID SELECTOR']. - (methodSel = (objectMemory splObj: SelectorDoesNotUnderstand) - and: [(objectMemory addressCouldBeObj: maybeMessage) - and: [(objectMemory fetchClassOfNonImm: maybeMessage) = (objectMemory splObj: ClassMessage)]]) ifTrue: - ["print arg message selector" - methodSel := objectMemory fetchPointer: MessageSelectorIndex ofObject: maybeMessage. - self print: ' '. - self printStringOf: methodSel]!

1 0

VM Maker: VMMaker.oscog-eem.490.mcz
by commits＠source.squeak.org 01 Nov '13

01 Nov '13

1 0

VM Maker: VMMaker.oscog-eem.489.mcz
by commits＠source.squeak.org 01 Nov '13

01 Nov '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.489.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.489 Author: eem Time: 31 October 2013, 9:55:43.597 pm UUID: 46b91af3-49f9-4110-8271-4ca4c04bd0b6 Ancestors: VMMaker.oscog-eem.488 Remember to follow forwarders in obj stacks in eliminateAndFreeForwarders. Change ensureRoomOnObjStackAt: to only set the mark bit on a new page, as old pages should already be marked. Remove the unused accessors for markStack and ephemeronQueue. Add an invalidObjStackPage inst var and a beefy assert to storePointer:ofObjStack:withValue: for debugging. Check mark state in isValidObjStackPage:myIndex: Collect obj stack GC into markAndTraceObjStacks, followForwardedObjStacks & validObjStacks. Rename updateRootOfObjStack: to updateRootOfObjStackAt: & updateRootOfObjStack:with: to updateRootOfObjStackAt:with: for consistency/comprehensibility. GC seems to run... =============== Diff against VMMaker.oscog-eem.488 =============== Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwarders (in category 'gc - global') ----- eliminateAndFreeForwarders "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders" | lowestForwarded firstForwarded lastForwarded | self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: hiddenRootsObj) not. (self isForwarded: specialObjectsOop) ifTrue: [specialObjectsOop := self followForwarded: specialObjectsOop]. + self followForwardedObjStacks. scavenger followRememberedForwardersAndForgetFreeObjects. self doScavenge: TenureByAge. lowestForwarded := 0. "sweep, following forwarders in all live objects, and finding the first forwarder." self allOldSpaceObjectsDo: [:o| (self isForwarded: o) ifTrue: [lowestForwarded = 0 ifTrue: [lowestForwarded := o]] ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. self assert: ((self isImmediate: f) or: [self isYoung: f]) not. self storePointerUnchecked: i ofObject: o withValue: f]]]]. firstForwarded := lastForwarded := 0. "sweep from lowest forwarder, coalescing runs of forwarders." self allOldSpaceObjectsFrom: lowestForwarded do: [:o| (self isForwarded: o) ifTrue: [firstForwarded = 0 ifTrue: [firstForwarded := o]. lastForwarded := o] ifFalse: [firstForwarded ~= 0 ifTrue: [| start bytes | start := self startOfObject: firstForwarded. bytes := (self addressAfter: lastForwarded) - start. self addFreeChunkWithBytes: bytes at: start]. firstForwarded := 0]]. firstForwarded ~= 0 ifTrue: [| start bytes | start := self startOfObject: firstForwarded. bytes := (self addressAfter: lastForwarded) - start. self addFreeChunkWithBytes: bytes at: start].! Item was changed: ----- Method: SpurMemoryManager>>ensureRoomOnObjStackAt: (in category 'obj stacks') ----- ensureRoomOnObjStackAt: objStackRootIndex "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty. The list goes through ObjStackNextx. We don't want to shrink objStacks, since they're used in GC and its good to keep their memory around. So unused pages created by popping emptying pages are kept on the ObjStackFreex list." | stackOrNil freeOrNewPage | stackOrNil := self fetchPointer: objStackRootIndex ofObject: hiddenRootsObj. (stackOrNil = nilObj or: [(self fetchPointer: ObjStackTopx ofObject: stackOrNil) >= ObjStackLimit]) ifTrue: [freeOrNewPage := stackOrNil = nilObj ifTrue: [0] ifFalse: [self fetchPointer: ObjStackFreex ofObject: stackOrNil]. freeOrNewPage ~= 0 ifTrue: "the free page list is always on the new page." + [self storePointer: ObjStackFreex ofObjStack: stackOrNil withValue: 0. + self assert: (marking not or: [self isMarked: freeOrNewPage])] - [self storePointer: ObjStackFreex ofObjStack: stackOrNil withValue: 0] ifFalse: [freeOrNewPage := self allocateSlotsInOldSpace: ObjStackPageSlots format: self wordIndexableFormat classIndex: self wordSizeClassIndexPun. freeOrNewPage ifNil: [self error: 'no memory to allocate or extend obj stack']. + self storePointer: ObjStackFreex ofObjStack: freeOrNewPage withValue: 0.. + marking ifTrue: [self setIsMarkedOf: freeOrNewPage to: true]]. + self storePointer: ObjStackMyx ofObjStack: freeOrNewPage withValue: objStackRootIndex; + storePointer: ObjStackNextx ofObjStack: freeOrNewPage withValue: (stackOrNil = nilObj ifTrue: [0] ifFalse: [stackOrNil]); + storePointer: ObjStackTopx ofObjStack: freeOrNewPage withValue: 0; + storePointer: objStackRootIndex ofObject: hiddenRootsObj withValue: freeOrNewPage. + self assert: (self isValidObjStackAt: objStackRootIndex). + "Added a new page; now update and answer the relevant cached first page." + ^self updateRootOfObjStackAt: objStackRootIndex with: freeOrNewPage]. - self storePointer: ObjStackFreex ofObjStack: freeOrNewPage withValue: 0]. - marking ifTrue: [self setIsMarkedOf: freeOrNewPage to: true]. - self storePointer: ObjStackMyx ofObjStack: freeOrNewPage withValue: objStackRootIndex; - storePointer: ObjStackNextx ofObjStack: freeOrNewPage withValue: (stackOrNil = nilObj ifTrue: [0] ifFalse: [stackOrNil]); - storePointer: ObjStackTopx ofObjStack: freeOrNewPage withValue: 0; - storePointer: objStackRootIndex ofObject: hiddenRootsObj withValue: freeOrNewPage. - self assert: (self isValidObjStackAt: objStackRootIndex). - "Added a new page; now update and answer the relevant cached first page." - ^self updateRootOfObjStack: objStackRootIndex with: freeOrNewPage]. self assert: (self isValidObjStackAt: objStackRootIndex). ^stackOrNil! Item was removed: - ----- Method: SpurMemoryManager>>ephemeronQueue (in category 'gc - global') ----- - ephemeronQueue - ^self fetchPointer: EphemeronQueueRootIndex ofObject: hiddenRootsObj! Item was removed: - ----- Method: SpurMemoryManager>>ephemeronQueue: (in category 'gc - global') ----- - ephemeronQueue: anObject - self storePointer: EphemeronQueueRootIndex ofObject: hiddenRootsObj withValue: anObject! Item was added: + ----- Method: SpurMemoryManager>>followForwardedInObjStack:atIndex: (in category 'obj stacks') ----- + followForwardedInObjStack: objStack atIndex: objStackRootIndex + "Post-compact, follow forwarders in an obj stack." + | firstPage stackOrNil index field | + objStack = nilObj ifTrue: + [^objStack]. + stackOrNil := objStack. + (self isForwarded: stackOrNil) ifTrue: + [stackOrNil := self followForwarded: stackOrNil. + self updateRootOfObjStackAt: objStackRootIndex with: stackOrNil]. + firstPage := stackOrNil. + [self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. + self assert: (self fetchPointer: ObjStackMyx ofObject: stackOrNil) = objStackRootIndex. + "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so + if there were 5 slots in an oop stack, full would be 2, and the last 0-rel index is 4. + Hence the last index is topx + fixed slots - 1, or topx + ObjStackNextx" + index := (self fetchPointer: ObjStackTopx ofObject: stackOrNil) + ObjStackNextx. + "follow forwarded fields including ObjStackNextx and leave field containing the next link." + [field := self fetchPointer: index ofObject: stackOrNil. + (field ~= 0 and: [(self isNonImmediate: field) and: [self isForwarded: field]]) ifTrue: + [field := self followForwarded: field. + self storePointer: index ofObjStack: stackOrNil withValue: field]. + (index := index - 1) > ObjStackFreex] whileTrue. + self assert: field = (self fetchPointer: ObjStackNextx ofObject: stackOrNil). + (stackOrNil := field) ~= 0] whileTrue. + [stackOrNil := self fetchPointer: ObjStackFreex ofObject: firstPage. + stackOrNil ~= 0] whileTrue: + [(self isForwarded: stackOrNil) ifTrue: + [stackOrNil := self followForwarded: stackOrNil. + self storePointer: ObjStackFreex ofObjStack: firstPage withValue: stackOrNil]. + firstPage := stackOrNil]. + self assert: (self isValidObjStackAt: objStackRootIndex)! Item was added: + ----- Method: SpurMemoryManager>>followForwardedObjStacks (in category 'compaction') ----- + followForwardedObjStacks + "Compaction will move objStack pages as well as ordinary objects. + So they need their slots followed." + self followForwardedInObjStack: markStack atIndex: MarkStackRootIndex. + self followForwardedInObjStack: weaklingStack atIndex: WeaklingStackRootIndex. + self followForwardedInObjStack: ephemeronQueue atIndex: EphemeronQueueRootIndex! Item was changed: ----- Method: SpurMemoryManager>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect self runLeakCheckerForFullGC: true. + self assert: self validObjStacks. self markObjects. self nilUnmarkedWeaklingSlots. self freeUnmarkedObjectsAndSortAndCoalesceFreeSpace. self bestFitCompact. self eliminateAndFreeForwarders. + self assert: self validObjStacks. self runLeakCheckerForFullGC: true! Item was changed: ----- Method: SpurMemoryManager>>isValidObjStack: (in category 'obj stacks') ----- isValidObjStack: objStack "Answer if the obj stack at objStackRootIndex is valid." ((self addressCouldBeObj: objStack) and: [(self numSlotsOfAny: objStack) = ObjStackPageSlots]) ifFalse: [objStackInvalidBecause := 'first page not obj or wrong size'. + invalidObjStackPage := objStack. ^false]. ^self isValidObjStackPage: objStack myIndex: (self fetchPointer: ObjStackMyx ofObject: objStack) firstPage: true! Item was changed: ----- Method: SpurMemoryManager>>isValidObjStackPage:myIndex: (in category 'obj stacks') ----- isValidObjStackPage: objStackPage myIndex: myx "Just check the page itself." <inline: false> (self classIndexOf: objStackPage) = self wordSizeClassIndexPun ifFalse: [objStackInvalidBecause := 'wong class index'. + invalidObjStackPage := objStackPage. ^false]. (self formatOf: objStackPage) = self wordIndexableFormat ifFalse: [objStackInvalidBecause := 'wong format'. + invalidObjStackPage := objStackPage. ^false]. (self numSlotsOfAny: objStackPage) = ObjStackPageSlots ifFalse: [objStackInvalidBecause := 'wong num slots'. + invalidObjStackPage := objStackPage. ^false]. myx = (self fetchPointer: ObjStackMyx ofObject: objStackPage) ifFalse: [objStackInvalidBecause := 'wong myx'. + invalidObjStackPage := objStackPage. ^false]. + (marking and: [(self isMarked: objStackPage) not]) ifTrue: + [objStackInvalidBecause := 'marking but page is unmarked'. + invalidObjStackPage := objStackPage. + ^false]. ^true! Item was changed: ----- Method: SpurMemoryManager>>isValidObjStackPage:myIndex:firstPage: (in category 'obj stacks') ----- isValidObjStackPage: objStackPage myIndex: myx firstPage: isFirstPage "Answer if the obj stack at stackRootIndex is valid." | freeOrNextPage index | <inline: false> (self isValidObjStackPage: objStackPage myIndex: myx) ifFalse: [^false]. freeOrNextPage := self fetchPointer: ObjStackFreex ofObject: objStackPage. [freeOrNextPage ~= 0] whileTrue: [isFirstPage ifFalse: [objStackInvalidBecause := 'free page on other than first page'. + invalidObjStackPage := objStackPage. ^false]. (self isValidObjStackPage: freeOrNextPage myIndex: myx) ifFalse: [objStackInvalidBecause := self str: objStackInvalidBecause cat: ', on next page'. ^false]. freeOrNextPage := self fetchPointer: ObjStackFreex ofObject: freeOrNextPage]. isFirstPage ifTrue: [(myx between: self classTableRootSlots and: self classTableRootSlots + self hiddenRootSlots - 1) ifFalse: [objStackInvalidBecause := 'myx out of range'. + invalidObjStackPage := objStackPage. ^false]. (self fetchPointer: myx ofObject: hiddenRootsObj) = objStackPage ifFalse: [objStackInvalidBecause := 'firstPage is not root'. + invalidObjStackPage := objStackPage. ^false]]. index := self fetchPointer: ObjStackTopx ofObject: objStackPage. (index between: 0 and: ObjStackLimit) ifFalse: [objStackInvalidBecause := 'bad topx'. + invalidObjStackPage := objStackPage. ^false]. freeOrNextPage := self fetchPointer: ObjStackNextx ofObject: objStackPage. ^freeOrNextPage = 0 or: [self isValidObjStackPage: freeOrNextPage myIndex: myx firstPage: false]! Item was changed: ----- Method: SpurMemoryManager>>markAccessibleObjects (in category 'gc - global') ----- markAccessibleObjects self assert: self validClassTableRootPages. self assert: segmentManager allBridgesMarked. marking := true. self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: [MarkStackRecord ifNotNil: [MarkStackRecord resetTo: 1]]. + self markAndTraceObjStacks. - self markAndTraceObjStack: self markStack andContents: false. self assert: self validClassTableRootPages. - self markAndTraceObjStack: self ephemeronQueue andContents: true. - self assert: self validClassTableRootPages. coInterpreter markAndTraceInterpreterOops: true. self markAndTrace: self freeListsObj. self markAndTrace: hiddenRootsObj. self markAndTrace: self specialObjectsOop. + self assert: self validObjStacks. self markWeaklingsAndMarkAndFireEphemerons. + self assert: self validObjStacks. marking := false! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceObjStack:andContents: (in category 'obj stacks') ----- markAndTraceObjStack: stackOrNil andContents: markAndTraceContents "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty." <inline: false> | index field | stackOrNil = nilObj ifTrue: [^self]. + self setIsMarkedOf: stackOrNil to: true. self assert: (self numSlotsOfAny: stackOrNil) = ObjStackPageSlots. field := self fetchPointer: ObjStackNextx ofObject: stackOrNil. field ~= 0 ifTrue: [self markAndTraceObjStack: field andContents: markAndTraceContents]. field := stackOrNil. [field := self fetchPointer: ObjStackFreex ofObject: stackOrNil. field ~= 0] whileTrue: [self setIsMarkedOf: field to: true]. markAndTraceContents ifFalse: [^self]. "There are four fixed slots in an obj stack, and a Topx of 0 indicates empty, so if there were 6 slots in an oop stack, full would be 2, and the last 0-rel index is 5." index := (self fetchPointer: ObjStackTopx ofObject: stackOrNil) + ObjStackNextx. [index >= ObjStackFixedSlots] whileTrue: [field := self fetchPointer: index ofObject: stackOrNil. (self isImmediate: field) ifFalse: [self markAndTrace: field]. index := index - 1]! Item was added: + ----- Method: SpurMemoryManager>>markAndTraceObjStacks (in category 'obj stacks') ----- + markAndTraceObjStacks + self markAndTraceObjStack: markStack andContents: false. + self markAndTraceObjStack: weaklingStack andContents: false. + self markAndTraceObjStack: ephemeronQueue andContents: true! Item was removed: - ----- Method: SpurMemoryManager>>markStack (in category 'gc - global') ----- - markStack - ^self fetchPointer: MarkStackRootIndex ofObject: hiddenRootsObj! Item was removed: - ----- Method: SpurMemoryManager>>markStack: (in category 'gc - global') ----- - markStack: anObject - self storePointer: MarkStackRootIndex ofObject: hiddenRootsObj withValue: anObject! Item was changed: ----- Method: SpurMemoryManager>>noCheckPush:onObjStack: (in category 'obj stacks') ----- noCheckPush: objOop onObjStack: objStack "Push an element on an objStack. Split from push:onObjStack: for testing." | topx | self assert: (self isValidObjStack: objStack). self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: + [(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue: - [objStack = markStack ifTrue: [MarkStackRecord ifNotNil: [MarkStackRecord addLast: {#push. objOop}]]]. topx := self fetchPointer: ObjStackTopx ofObject: objStack. topx >= ObjStackLimit ifTrue: [self noCheckPush: objOop onObjStack: (self ensureRoomOnObjStackAt: (self fetchPointer: ObjStackMyx ofObject: objStack))] ifFalse: [self storePointer: ObjStackFixedSlots + topx ofObjStack: objStack withValue: objOop. self storePointer: ObjStackTopx ofObjStack: objStack withValue: topx + 1]. ^objOop! Item was changed: ----- Method: SpurMemoryManager>>popObjStack: (in category 'obj stacks') ----- popObjStack: objStack | topx top nextPage myx | self assert: (self isValidObjStack: objStack). topx := self fetchPointer: ObjStackTopx ofObject: objStack. topx = 0 ifTrue: [self assert: (self fetchPointer: ObjStackNextx ofObject: objStack) = 0. self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: + [(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue: + [MarkStackRecord ifNotNil: + [MarkStackRecord addLast: {#EMPTY. nil}]]]. - [MarkStackRecord ifNotNil: - [MarkStackRecord addLast: {#EMPTY. nil}]]. ^nil]. topx := topx - 1. top := self fetchPointer: topx + ObjStackFixedSlots ofObject: objStack. self cCode: [] "for debugging markAndTrace: set (MarkStackRecord := OrderedCollection new)" inSmalltalk: + [(self fetchPointer: ObjStackMyx ofObject: objStack) = MarkStackRootIndex ifTrue: + [MarkStackRecord ifNotNil: + [(MarkStackRecord last first = #push and: [MarkStackRecord last last = top]) + ifTrue: [MarkStackRecord removeLast] + ifFalse: [MarkStackRecord addLast: {#pop. top}]]]]. - [MarkStackRecord ifNotNil: - [(MarkStackRecord last first = #push and: [MarkStackRecord last last = top]) - ifTrue: [MarkStackRecord removeLast] - ifFalse: [MarkStackRecord addLast: {#pop. top}]]]. self storePointer: ObjStackTopx ofObject: objStack withValue: topx. (topx = 0 and: [(nextPage := self fetchPointer: ObjStackNextx ofObject: objStack) ~= 0]) ifTrue: [self storePointer: ObjStackFreex ofObjStack: nextPage withValue: objStack. self storePointer: ObjStackNextx ofObjStack: objStack withValue: 0. myx := self fetchPointer: ObjStackMyx ofObject: objStack. + self updateRootOfObjStackAt: myx with: nextPage]. - self updateRootOfObjStack: myx with: nextPage]. ^top! Item was changed: ----- Method: SpurMemoryManager>>storePointer:ofObjStack:withValue: (in category 'object access') ----- + storePointer: fieldIndex ofObjStack: objStackPage withValue: thang + self assert: (self formatOf: objStackPage) = self wordIndexableFormat. + self cCode: [] + inSmalltalk: + [fieldIndex caseOf: { + [ObjStackTopx] -> [self assert: (thang between: 0 and: ObjStackLimit)]. + [ObjStackMyx] -> [self assert: (thang between: MarkStackRootIndex and: EphemeronQueueRootIndex)]. + [ObjStackFreex] -> [self assert: (thang = 0 + or: [(self addressCouldBeObj: thang) + and: [(self numSlotsOfAny: thang) = ObjStackPageSlots + and: [(self formatOf: thang) = self wordIndexableFormat]]])]. + [ObjStackNextx] -> [self assert: (thang = 0 + or: [(self addressCouldBeObj: thang) + and: [(self numSlotsOfAny: thang) = ObjStackPageSlots + and: [(self formatOf: thang) = self wordIndexableFormat]]])]. } + otherwise: []]. - storePointer: fieldIndex ofObjStack: objOop withValue: valuePointer - self assert: (self formatOf: objOop) = self wordIndexableFormat. ^self + longAt: objStackPage + self baseHeaderSize + (fieldIndex << self shiftForWord) + put: thang! - longAt: objOop + self baseHeaderSize + (fieldIndex << self shiftForWord) - put: valuePointer! Item was removed: - ----- Method: SpurMemoryManager>>updateRootOfObjStack:with: (in category 'obj stacks') ----- - updateRootOfObjStack: objStackRootIndex with: newRootPage - self storePointer: objStackRootIndex - ofObject: hiddenRootsObj - withValue: newRootPage. - objStackRootIndex caseOf: { - [MarkStackRootIndex] -> [markStack := newRootPage]. - [WeaklingStackRootIndex] -> [weaklingStack := newRootPage]. - [EphemeronQueueRootIndex] -> [ephemeronQueue := newRootPage] }. - self assert: (self isValidObjStack: newRootPage). - ^newRootPage! Item was added: + ----- Method: SpurMemoryManager>>updateRootOfObjStackAt:with: (in category 'obj stacks') ----- + updateRootOfObjStackAt: objStackRootIndex with: newRootPage + self storePointer: objStackRootIndex + ofObject: hiddenRootsObj + withValue: newRootPage. + objStackRootIndex caseOf: { + [MarkStackRootIndex] -> [markStack := newRootPage]. + [WeaklingStackRootIndex] -> [weaklingStack := newRootPage]. + [EphemeronQueueRootIndex] -> [ephemeronQueue := newRootPage] }. + self assert: (self isValidObjStack: newRootPage). + ^newRootPage! Item was added: + ----- Method: SpurMemoryManager>>validObjStacks (in category 'obj stacks') ----- + validObjStacks + ^(markStack = nilObj or: [self isValidObjStack: markStack]) + and: [(weaklingStack = nilObj or: [self isValidObjStack: weaklingStack]) + and: [ephemeronQueue = nilObj or: [self isValidObjStack: ephemeronQueue]]]!

1 0

VM Maker: VMMaker.oscog-eem.489.mcz
by commits＠source.squeak.org 01 Nov '13

01 Nov '13

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2013