Vm-dev April 2016

vm-dev@lists.squeakfoundation.org

35 participants
202 discussions

VM Maker: VMMaker.oscog-eem.1834.mcz
by commits＠source.squeak.org 22 Apr '16

22 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1834.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1834 Author: eem Time: 22 April 2016, 1:04:12.789614 pm UUID: 858a9c54-959b-4d7e-b9b3-5f083d37f488 Ancestors: VMMaker.oscog-eem.1833 1834: Charles Babbage begins the conceptual design of the "Analytical Engine", a mechanical forerunner of the modern computer. Fix slips in my versions of the offset time primitives. They need to pop argumentCount + 1, not argumentCount. =============== Diff against VMMaker.oscog-eem.1833 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveUtcAndTimezoneOffset (in category 'system control primitives') ----- primitiveUtcAndTimezoneOffset "Answer an array with UTC microseconds since the Smalltalk epoch and the current seconds offset from GMT in the local time zone. Any pointer object with two or more slots) may be supplied as a parameter." | resultArray | argumentCount > 0 ifTrue: [argumentCount > 1 ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. resultArray := self stackTop. ((objectMemory isPointers: resultArray) and: [(objectMemory lengthOf: resultArray) >= 2]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]] ifFalse: [resultArray := objectMemory instantiateClass: objectMemory classArray indexableSize: 2]. "N.B. No pushRemappableOop:/popRemappableOop in Cog because positive64BitIntegerFor: et al use eeInstantiate... allocators which are guaranteed not to do a GC." objectMemory storePointerUnchecked: 1 ofObject: resultArray withValue: (objectMemory integerObjectOf: self ioLocalSecondsOffset); storePointer: 0 ofObject: resultArray withValue: (self positive64BitIntegerFor: self ioUTCMicroseconds). + self pop: argumentCount + 1 thenPush: resultArray! - self pop: argumentCount thenPush: resultArray! Item was changed: ----- Method: InterpreterPrimitives>>primitiveUtcWithOffset (in category 'system control primitives') ----- primitiveUtcWithOffset "Answer an array with UTC microseconds since the Posix epoch and the current seconds offset from GMT in the local time zone. An empty two element array (or any object with two or more slots) may be supplied as a parameter. This is a named (not numbered) primitive in the null module (ie the VM)" | epochDelta resultArray | <export: true> <var: #epochDelta declareC: 'static usqLong epochDelta = 2177452800000000ULL'> self cCode: '' inSmalltalk: [epochDelta := 2177452800000000]. argumentCount > 0 ifTrue: [argumentCount > 1 ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. resultArray := self stackTop. ((objectMemory isPointers: resultArray) and: [(objectMemory lengthOf: resultArray) >= 2]) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]] ifFalse: [resultArray := objectMemory instantiateClass: objectMemory classArray indexableSize: 2]. "N.B. No pushRemappableOop:/popRemappableOop in Cog because positive64BitIntegerFor: et al use eeInstantiate... allocators which are guaranteed not to do a GC." objectMemory storePointerUnchecked: 1 ofObject: resultArray withValue: (objectMemory integerObjectOf: self ioLocalSecondsOffset); storePointer: 0 ofObject: resultArray withValue: (self positive64BitIntegerFor: self ioUTCMicroseconds - epochDelta). + self pop: argumentCount + 1 thenPush: resultArray! - self pop: argumentCount thenPush: resultArray!

1 0

[commit][3678] CogVM source as per VMMaker.oscog-eem.1833
by commits＠squeakvm.org 22 Apr '16

22 Apr '16

Revision: 3678 Author: eliot Date: 2016-04-22 11:26:57 -0700 (Fri, 22 Apr 2016) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1833 Cogit: - split compileAbstractInstruction in sub methods to understand what is going on. - Fix a bug in genUpArrowReturn (deadCode should be set to true for non local return). Fixing this allow to simplify compileAbstractInstruction 64-bit Cogit: is32BitSignedImmediate: & isSignExtendedFourByteValue: are the same; we only need one. Fix PushCq for fully 64-bit quick constants (eg immediate floats). Plugins: Generate integer type checking as C macros rather than direct/indirect interpreterProxy function call in plugins. Merge the LargeIntegersPlugin acceleration for type checking again (VMMaker.oscog-nice.1823). This remove the need for (compatibility broken) platforms/Cross/vm/sqVirtualMemory.[ch] rev 3673 which can now safely be reverted. Fix primAlienReplace to use positiveMachineIntegerValueOf: instead of positive32BitValueOf:. Modified Paths: -------------- branches/Cog/nsspur64src/vm/cogit.h branches/Cog/nsspur64src/vm/cogitX64.c branches/Cog/nsspur64src/vm/cointerp.c branches/Cog/nsspur64src/vm/cointerp.h branches/Cog/nsspur64src/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.c branches/Cog/nsspursrc/vm/cogitMIPSEL.c branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstack64src/vm/gcc3x-interp.c branches/Cog/nsspurstack64src/vm/interp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spur64src/vm/cogit.h branches/Cog/spur64src/vm/cogitX64.c branches/Cog/spur64src/vm/cointerp.c branches/Cog/spur64src/vm/cointerp.h branches/Cog/spur64src/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.c branches/Cog/spursistasrc/vm/cogitMIPSEL.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogitARMv5.c branches/Cog/spursrc/vm/cogitIA32.c branches/Cog/spursrc/vm/cogitMIPSEL.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/src/plugins/FilePlugin/FilePlugin.c branches/Cog/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c branches/Cog/src/plugins/IA32ABI/IA32ABI.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c branches/Cog/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c branches/Cog/src/plugins/Squeak3D/Squeak3D.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64SysVFFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/X64Win64FFIPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.c branches/Cog/src/vm/cogitMIPSEL.c branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspur64src/vm/cogit.h =================================================================== --- branches/Cog/nsspur64src/vm/cogit.h 2016-04-21 23:51:51 UTC (rev 3677) +++ branches/Cog/nsspur64src/vm/cogit.h 2016-04-22 18:26:57 UTC (rev 3678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe + CCodeGenerator VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a */ Modified: branches/Cog/nsspur64src/vm/cogitX64.c =================================================================== --- branches/Cog/nsspur64src/vm/cogitX64.c 2016-04-21 23:51:51 UTC (rev 3677) +++ branches/Cog/nsspur64src/vm/cogitX64.c 2016-04-22 18:26:57 UTC (rev 3678) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe + CCodeGenerator VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a from - StackToRegisterMappingCogit VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe + StackToRegisterMappingCogit VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -598,6 +598,7 @@ static AbstractInstruction * lastOpcode(void); extern void linkNSSendCacheclassTagenclosingObjecttargetcaller(NSSendCache *nsSendCache, sqInt classTag, sqInt enclosingObject, CogMethod *targetMethod, CogMethod *callingMethod); extern void linkSendAtintooffsetreceiver(sqInt callSiteReturnAddress, CogMethod *sendingMethod, CogMethod *targetMethod, sqInt theEntryOffset, sqInt receiver); +static BytecodeDescriptor * loadBytesAndGetDescriptor(void); static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc); static AbstractInstruction * NoDbgRegParms gMoveAwR(sqInt address, sqInt reg); static AbstractInstruction * NoDbgRegParms gMoveCwR(sqInt wordConstant, sqInt reg); @@ -902,6 +903,7 @@ static sqInt NoDbgRegParms cmpC32RTempByteSize(AbstractInstruction * self_in_cmpC32RTempByteSize); static sqInt NoDbgRegParms computeMaximumSize(AbstractInstruction * self_in_computeMaximumSize); static sqInt NoDbgRegParms computeShiftRRSize(AbstractInstruction * self_in_computeShiftRRSize); +static sqInt NoDbgRegParms computeSizeOfPushCw(AbstractInstruction * self_in_computeSizeOfPushCw); static usqInt NoDbgRegParms concretizeArithCqRWithROraxOpcode(AbstractInstruction * self_in_concretizeArithCqRWithROraxOpcode, sqInt regOpcode, sqInt raxOpcode); static usqInt NoDbgRegParms concretizeFill32(AbstractInstruction * self_in_concretizeFill32); static usqInt NoDbgRegParms concretizeMoveRX32rR(AbstractInstruction * self_in_concretizeMoveRX32rR); @@ -931,7 +933,6 @@ static sqInt NoDbgRegParms isCallPrecedingReturnPC(AbstractInstruction * self_in_isCallPrecedingReturnPC, sqInt mcpc); static sqInt NoDbgRegParms isJumpAt(AbstractInstruction * self_in_isJumpAt, sqInt pc); static sqInt NoDbgRegParms isQuick(AbstractInstruction * self_in_isQuick, unsigned long operand); -static sqInt NoDbgRegParms isSignExtendedFourByteValue(AbstractInstruction * self_in_isSignExtendedFourByteValue, sqInt unsigned64BitValue); static sqInt NoDbgRegParms isWithinMwOffsetRange(AbstractInstruction * self_in_isWithinMwOffsetRange, sqInt anAddress); static AbstractInstruction * NoDbgRegParms jmpTarget(AbstractInstruction * self_in_jmpTarget, AbstractInstruction *anAbstractInstruction); static sqInt NoDbgRegParms jumpLongByteSize(AbstractInstruction * self_in_jumpLongByteSize); @@ -1147,6 +1148,7 @@ static void NoDbgRegParms initSimStackForFramelessBlock(sqInt startpc); static void NoDbgRegParms initSimStackForFramelessMethod(sqInt startpc); static sqInt liveRegisters(void); +static sqInt NoDbgRegParms mapDeadDescriptorIfNeeded(BytecodeDescriptor *descriptor); static void NoDbgRegParms marshallAbsentReceiverSendArguments(sqInt numArgs); static void NoDbgRegParms marshallSendArguments(sqInt numArgs); static sqInt NoDbgRegParms mergeWithFixupIfRequired(BytecodeFixup *fixup); @@ -1270,6 +1272,7 @@ static sqInt cPICEndSize; static sqInt cPICPrototype; static sqInt deadCode; +static sqInt debugBytecodePointers; static sqInt debugFixupBreaks; static sqInt debugOpcodeIndices; unsigned long debugPrimCallStackOffset; @@ -2233,7 +2236,7 @@ if (isQuick(self_in_computeSizeOfArithCqR, ((self_in_computeSizeOfArithCqR->operands))[0])) { return 4; } - if (isSignExtendedFourByteValue(self_in_computeSizeOfArithCqR, ((self_in_computeSizeOfArithCqR->operands))[0])) { + if (is32BitSignedImmediate(self_in_computeSizeOfArithCqR, ((self_in_computeSizeOfArithCqR->operands))[0])) { return ((((self_in_computeSizeOfArithCqR->operands))[1]) == RAX ? 6 : 7); @@ -5920,12 +5923,12 @@ generateMapAtstart(sqInt addressOrNull, sqInt startAddress) { unsigned char annotation; - usqInt delta; + sqInt delta; sqInt i; AbstractInstruction *instruction; sqInt length; - usqInt location; - usqInt mapEntry; + sqInt location; + sqInt mapEntry; sqInt maxDelta; usqInt mcpc; @@ -7067,6 +7070,18 @@ flushICacheFromto(processor, (((usqInt)callSiteReturnAddress)) - extent, ((usqInt)callSiteReturnAddress)); } + /* Cogit>>#loadBytesAndGetDescriptor */ +static BytecodeDescriptor * +loadBytesAndGetDescriptor(void) +{ + BytecodeDescriptor *descriptor; + + byte0 = (fetchByteofObject(bytecodePC, methodObj)) + bytecodeSetOffset; + descriptor = generatorAt(byte0); + loadSubsequentBytesForDescriptorat(descriptor, bytecodePC); + return descriptor; +} + /* Cogit>>#loadSubsequentBytesForDescriptor:at: */ static void NoDbgRegParms loadSubsequentBytesForDescriptorat(BytecodeDescriptor *descriptor, sqInt pc) @@ -17021,7 +17036,7 @@ if (isQuick(self_in_computeMaximumSize, ((self_in_computeMaximumSize->operands))[0])) { return 4; } - if (isSignExtendedFourByteValue(self_in_computeMaximumSize, ((self_in_computeMaximumSize->operands))[0])) { + if (is32BitSignedImmediate(self_in_computeMaximumSize, ((self_in_computeMaximumSize->operands))[0])) { return ((((self_in_computeMaximumSize->operands))[1]) == RAX ? 6 : 7); @@ -17240,12 +17255,12 @@ case PushCq: return (isQuick(self_in_computeMaximumSize, ((self_in_computeMaximumSize->operands))[0]) ? 2 - : 5); + : (is32BitSignedImmediate(self_in_computeMaximumSize, ((self_in_computeMaximumSize->operands))[0]) + ? 5 + : computeSizeOfPushCw(self_in_computeMaximumSize))); case PushCw: - return (inCurrentCompilation(self_in_computeMaximumSize, ((self_in_computeMaximumSize->operands))[0]) - ? 9 - : 12); + return computeSizeOfPushCw(self_in_computeMaximumSize); case PrefetchAw: return (isAddressRelativeToVarBase(self_in_computeMaximumSize, ((self_in_computeMaximumSize->operands))[0]) @@ -17277,7 +17292,16 @@ : (3 + 3) + 3)); } + /* CogX64Compiler>>#computeSizeOfPushCw */ +static sqInt NoDbgRegParms +computeSizeOfPushCw(AbstractInstruction * self_in_computeSizeOfPushCw) +{ + return (inCurrentCompilation(self_in_computeSizeOfPushCw, ((self_in_computeSizeOfPushCw->operands))[0]) + ? 9 + : 12); +} + /* Will get inlined into concretizeAt: switch. */ /* CogX64Compiler>>#concretizeArithCqRWithRO:raxOpcode: */ @@ -17296,7 +17320,7 @@ ((self_in_concretizeArithCqRWithROraxOpcode->machineCode))[3] = (value & 0xFF); return ((self_in_concretizeArithCqRWithROraxOpcode->machineCodeSize) = 4); } - if (isSignExtendedFourByteValue(self_in_concretizeArithCqRWithROraxOpcode, value)) { + if (is32BitSignedImmediate(self_in_concretizeArithCqRWithROraxOpcode, value)) { if (reg == RAX) { ((self_in_concretizeArithCqRWithROraxOpcode->machineCode))[1] = raxOpcode; ((self_in_concretizeArithCqRWithROraxOpcode->machineCode))[2] = (value & 0xFF); @@ -17637,7 +17661,7 @@ unsigned long offset15; unsigned long offset16; unsigned long offset17; - sqInt offset18; + unsigned long offset18; sqInt offset19; unsigned long offset2; sqInt offset20; @@ -17659,6 +17683,7 @@ sqInt offset35; sqInt offset36; sqInt offset37; + sqInt offset38; unsigned long offset4; unsigned long offset5; unsigned long offset6; @@ -17740,6 +17765,7 @@ unsigned long value5; unsigned long value6; unsigned long value7; + unsigned long value8; unsigned long word; @@ -17894,12 +17920,12 @@ } assert(jumpTarget12 != 0); jumpTarget3 = jumpTarget12; - offset22 = (((int) jumpTarget3)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset23 = (((int) jumpTarget3)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset22) + ? isQuick(self_in_dispatchConcretize, offset23) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 4); - ((self_in_dispatchConcretize->machineCode))[1] = (offset22 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset23 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -17934,12 +17960,12 @@ } assert(jumpTarget13 != 0); jumpTarget4 = jumpTarget13; - offset23 = (((int) jumpTarget4)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset24 = (((int) jumpTarget4)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset23) + ? isQuick(self_in_dispatchConcretize, offset24) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 5); - ((self_in_dispatchConcretize->machineCode))[1] = (offset23 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset24 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -17999,12 +18025,12 @@ } assert(jumpTarget14 != 0); jumpTarget5 = jumpTarget14; - offset24 = (((int) jumpTarget5)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset25 = (((int) jumpTarget5)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset24) + ? isQuick(self_in_dispatchConcretize, offset25) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 8); - ((self_in_dispatchConcretize->machineCode))[1] = (offset24 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset25 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18037,12 +18063,12 @@ } assert(jumpTarget15 != 0); jumpTarget6 = jumpTarget15; - offset25 = (((int) jumpTarget6)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset26 = (((int) jumpTarget6)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset25) + ? isQuick(self_in_dispatchConcretize, offset26) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 9); - ((self_in_dispatchConcretize->machineCode))[1] = (offset25 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset26 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18075,12 +18101,12 @@ } assert(jumpTarget16 != 0); jumpTarget7 = jumpTarget16; - offset26 = (((int) jumpTarget7)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset27 = (((int) jumpTarget7)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset26) + ? isQuick(self_in_dispatchConcretize, offset27) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112); - ((self_in_dispatchConcretize->machineCode))[1] = (offset26 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset27 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18113,12 +18139,12 @@ } assert(jumpTarget17 != 0); jumpTarget8 = jumpTarget17; - offset27 = (((int) jumpTarget8)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset28 = (((int) jumpTarget8)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset27) + ? isQuick(self_in_dispatchConcretize, offset28) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 1); - ((self_in_dispatchConcretize->machineCode))[1] = (offset27 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset28 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18153,12 +18179,12 @@ } assert(jumpTarget18 != 0); jumpTarget9 = jumpTarget18; - offset28 = (((int) jumpTarget9)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset29 = (((int) jumpTarget9)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset28) + ? isQuick(self_in_dispatchConcretize, offset29) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 2); - ((self_in_dispatchConcretize->machineCode))[1] = (offset28 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset29 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18193,12 +18219,12 @@ } assert(jumpTarget19 != 0); jumpTarget10 = jumpTarget19; - offset29 = (((int) jumpTarget10)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset30 = (((int) jumpTarget10)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset29) + ? isQuick(self_in_dispatchConcretize, offset30) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 3); - ((self_in_dispatchConcretize->machineCode))[1] = (offset29 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset30 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18231,12 +18257,12 @@ } assert(jumpTarget110 != 0); jumpTarget20 = jumpTarget110; - offset30 = (((int) jumpTarget20)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset31 = (((int) jumpTarget20)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset30) + ? isQuick(self_in_dispatchConcretize, offset31) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 12); - ((self_in_dispatchConcretize->machineCode))[1] = (offset30 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset31 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18269,12 +18295,12 @@ } assert(jumpTarget119 != 0); jumpTarget29 = jumpTarget119; - offset31 = (((int) jumpTarget29)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset32 = (((int) jumpTarget29)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset31) + ? isQuick(self_in_dispatchConcretize, offset32) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 13); - ((self_in_dispatchConcretize->machineCode))[1] = (offset31 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset32 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18307,12 +18333,12 @@ } assert(jumpTarget120 != 0); jumpTarget30 = jumpTarget120; - offset32 = (((int) jumpTarget30)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset33 = (((int) jumpTarget30)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset32) + ? isQuick(self_in_dispatchConcretize, offset33) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 15); - ((self_in_dispatchConcretize->machineCode))[1] = (offset32 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset33 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18345,12 +18371,12 @@ } assert(jumpTarget121 != 0); jumpTarget31 = jumpTarget121; - offset33 = (((int) jumpTarget31)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset34 = (((int) jumpTarget31)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset33) + ? isQuick(self_in_dispatchConcretize, offset34) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 14); - ((self_in_dispatchConcretize->machineCode))[1] = (offset33 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset34 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18384,12 +18410,12 @@ } assert(jumpTarget122 != 0); jumpTarget32 = jumpTarget122; - offset34 = (((int) jumpTarget32)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset35 = (((int) jumpTarget32)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset34) + ? isQuick(self_in_dispatchConcretize, offset35) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 7); - ((self_in_dispatchConcretize->machineCode))[1] = (offset34 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset35 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18423,12 +18449,12 @@ } assert(jumpTarget123 != 0); jumpTarget33 = jumpTarget123; - offset35 = (((int) jumpTarget33)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset36 = (((int) jumpTarget33)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset35) + ? isQuick(self_in_dispatchConcretize, offset36) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 6); - ((self_in_dispatchConcretize->machineCode))[1] = (offset35 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset36 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18461,12 +18487,12 @@ } assert(jumpTarget124 != 0); jumpTarget34 = jumpTarget124; - offset36 = (((int) jumpTarget34)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset37 = (((int) jumpTarget34)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset36) + ? isQuick(self_in_dispatchConcretize, offset37) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 11); - ((self_in_dispatchConcretize->machineCode))[1] = (offset36 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset37 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18499,12 +18525,12 @@ } assert(jumpTarget125 != 0); jumpTarget35 = jumpTarget125; - offset37 = (((int) jumpTarget35)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); + offset38 = (((int) jumpTarget35)) - (((int) (((self_in_dispatchConcretize->address)) + 2))); if ((((self_in_dispatchConcretize->machineCodeSize)) == 0 - ? isQuick(self_in_dispatchConcretize, offset37) + ? isQuick(self_in_dispatchConcretize, offset38) : ((self_in_dispatchConcretize->machineCodeSize)) == 2)) { ((self_in_dispatchConcretize->machineCode))[0] = (112 + 10); - ((self_in_dispatchConcretize->machineCode))[1] = (offset37 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[1] = (offset38 & 0xFF); ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } @@ -18594,7 +18620,7 @@ ((self_in_dispatchConcretize->machineCodeSize) = 4); return; } - if (isSignExtendedFourByteValue(self_in_dispatchConcretize, value)) { + if (is32BitSignedImmediate(self_in_dispatchConcretize, value)) { if (reg3 == RAX) { ((self_in_dispatchConcretize->machineCode))[1] = 169; ((self_in_dispatchConcretize->machineCode))[2] = (value & 0xFF); @@ -19089,53 +19115,53 @@ ((self_in_dispatchConcretize->operands))[1] = RBX; ((self_in_dispatchConcretize->operands))[2] = save1; /* begin concretizeMoveMwrR */ - offset17 = ((self_in_dispatchConcretize->operands))[0]; + offset18 = ((self_in_dispatchConcretize->operands))[0]; srcReg12 = ((self_in_dispatchConcretize->operands))[1]; destReg13 = ((self_in_dispatchConcretize->operands))[2]; ((self_in_dispatchConcretize->machineCode))[0] = (rexRxb(self_in_dispatchConcretize, destReg13, 0, srcReg12)); ((self_in_dispatchConcretize->machineCode))[1] = 139; if ((srcReg12 != RSP) && (srcReg12 != R12)) { - if ((offset17 == 0) + if ((offset18 == 0) && ((srcReg12 != RBP) && (srcReg12 != R13))) { ((self_in_dispatchConcretize->machineCode))[2] = (modRMRO(self_in_dispatchConcretize, ModRegInd, srcReg12, destReg13)); (self_in_dispatchConcretize->machineCodeSize) = 3; goto l1; } - if (isQuick(self_in_dispatchConcretize, offset17)) { + if (isQuick(self_in_dispatchConcretize, offset18)) { ((self_in_dispatchConcretize->machineCode))[2] = (modRMRO(self_in_dispatchConcretize, ModRegRegDisp8, srcReg12, destReg13)); - ((self_in_dispatchConcretize->machineCode))[3] = (offset17 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = (offset18 & 0xFF); (self_in_dispatchConcretize->machineCodeSize) = 4; goto l1; } ((self_in_dispatchConcretize->machineCode))[2] = (modRMRO(self_in_dispatchConcretize, ModRegRegDisp32, srcReg12, destReg13)); - ((self_in_dispatchConcretize->machineCode))[3] = (offset17 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[6] = ((((usqInt) offset17) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = (offset18 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset18) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset18) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[6] = ((((usqInt) offset18) >> 24) & 0xFF); (self_in_dispatchConcretize->machineCodeSize) = 7; goto l1; } - if (offset17 == 0) { + if (offset18 == 0) { ((self_in_dispatchConcretize->machineCode))[2] = (modRMRO(self_in_dispatchConcretize, ModRegInd, srcReg12, destReg13)); ((self_in_dispatchConcretize->machineCode))[3] = (sib(self_in_dispatchConcretize, SIB1, 4, srcReg12)); (self_in_dispatchConcretize->machineCodeSize) = 4; goto l1; } - if (isQuick(self_in_dispatchConcretize, offset17)) { + if (isQuick(self_in_dispatchConcretize, offset18)) { ((self_in_dispatchConcretize->machineCode))[2] = (modRMRO(self_in_dispatchConcretize, ModRegRegDisp8, srcReg12, destReg13)); ((self_in_dispatchConcretize->machineCode))[3] = (sib(self_in_dispatchConcretize, SIB1, 4, srcReg12)); - ((self_in_dispatchConcretize->machineCode))[4] = (offset17 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = (offset18 & 0xFF); (self_in_dispatchConcretize->machineCodeSize) = 5; goto l1; } ((self_in_dispatchConcretize->machineCode))[2] = (modRMRO(self_in_dispatchConcretize, ModRegRegDisp32, srcReg12, destReg13)); ((self_in_dispatchConcretize->machineCode))[3] = (sib(self_in_dispatchConcretize, SIB1, 4, srcReg12)); - ((self_in_dispatchConcretize->machineCode))[4] = (offset17 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[6] = ((((usqInt) offset17) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[7] = ((((usqInt) offset17) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = (offset18 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset18) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[6] = ((((usqInt) offset18) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[7] = ((((usqInt) offset18) >> 24) & 0xFF); (self_in_dispatchConcretize->machineCodeSize) = 8; l1: /* end concretizeMoveMwrR */; ((self_in_dispatchConcretize->operands))[0] = save0; @@ -19146,23 +19172,23 @@ } reg18 = ((self_in_dispatchConcretize->operands))[1]; if (reg18 == RAX) { - offset18 = 0; + offset19 = 0; } else { ((self_in_dispatchConcretize->machineCode))[0] = (rexRxb(self_in_dispatchConcretize, 0, 0, reg18)); ((self_in_dispatchConcretize->machineCode))[1] = (144 + (reg18 % 8)); - offset18 = 2; + offset19 = 2; } - ((self_in_dispatchConcretize->machineCode))[0 + offset18] = 72; - ((self_in_dispatchConcretize->machineCode))[1 + offset18] = 161; - ((self_in_dispatchConcretize->machineCode))[2 + offset18] = (addressOperand & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3 + offset18] = ((((usqInt) addressOperand) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4 + offset18] = ((((usqInt) addressOperand) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5 + offset18] = ((((usqInt) addressOperand) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[6 + offset18] = ((((usqInt) addressOperand) >> 32) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[7 + offset18] = ((((usqInt) addressOperand) >> 40) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[8 + offset18] = ((((usqInt) addressOperand) >> 48) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[9 + offset18] = ((((usqInt) addressOperand) >> 56) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[0 + offset19] = 72; + ((self_in_dispatchConcretize->machineCode))[1 + offset19] = 161; + ((self_in_dispatchConcretize->machineCode))[2 + offset19] = (addressOperand & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3 + offset19] = ((((usqInt) addressOperand) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4 + offset19] = ((((usqInt) addressOperand) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5 + offset19] = ((((usqInt) addressOperand) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[6 + offset19] = ((((usqInt) addressOperand) >> 32) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[7 + offset19] = ((((usqInt) addressOperand) >> 40) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[8 + offset19] = ((((usqInt) addressOperand) >> 48) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[9 + offset19] = ((((usqInt) addressOperand) >> 56) & 0xFF); if (reg18 == RAX) { ((self_in_dispatchConcretize->machineCodeSize) = 10); return; @@ -19242,23 +19268,23 @@ return; } if (reg19 == RAX) { - offset19 = 0; + offset20 = 0; } else { ((self_in_dispatchConcretize->machineCode))[0] = (rexRxb(self_in_dispatchConcretize, 0, 0, reg19)); ((self_in_dispatchConcretize->machineCode))[1] = (144 + (reg19 % 8)); - offset19 = 2; + offset20 = 2; } - ((self_in_dispatchConcretize->machineCode))[0 + offset19] = 72; - ((self_in_dispatchConcretize->machineCode))[1 + offset19] = 163; - ((self_in_dispatchConcretize->machineCode))[2 + offset19] = (addressOperand1 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3 + offset19] = ((((usqInt) addressOperand1) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4 + offset19] = ((((usqInt) addressOperand1) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5 + offset19] = ((((usqInt) addressOperand1) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[6 + offset19] = ((((usqInt) addressOperand1) >> 32) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[7 + offset19] = ((((usqInt) addressOperand1) >> 40) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[8 + offset19] = ((((usqInt) addressOperand1) >> 48) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[9 + offset19] = ((((usqInt) addressOperand1) >> 56) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[0 + offset20] = 72; + ((self_in_dispatchConcretize->machineCode))[1 + offset20] = 163; + ((self_in_dispatchConcretize->machineCode))[2 + offset20] = (addressOperand1 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3 + offset20] = ((((usqInt) addressOperand1) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4 + offset20] = ((((usqInt) addressOperand1) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5 + offset20] = ((((usqInt) addressOperand1) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[6 + offset20] = ((((usqInt) addressOperand1) >> 32) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[7 + offset20] = ((((usqInt) addressOperand1) >> 40) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[8 + offset20] = ((((usqInt) addressOperand1) >> 48) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[9 + offset20] = ((((usqInt) addressOperand1) >> 56) & 0xFF); if (reg19 == RAX) { ((self_in_dispatchConcretize->machineCodeSize) = 10); return; @@ -19341,23 +19367,23 @@ } reg20 = ((self_in_dispatchConcretize->operands))[1]; if (reg20 == RAX) { - offset20 = 0; + offset21 = 0; } else { ((self_in_dispatchConcretize->machineCode))[0] = (rexRxb(self_in_dispatchConcretize, 0, 0, reg20)); ((self_in_dispatchConcretize->machineCode))[1] = (144 + (reg20 % 8)); - offset20 = 2; + offset21 = 2; } - ((self_in_dispatchConcretize->machineCode))[0 + offset20] = 72; - ((self_in_dispatchConcretize->machineCode))[1 + offset20] = 160; - ((self_in_dispatchConcretize->machineCode))[2 + offset20] = (addressOperand2 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3 + offset20] = ((((usqInt) addressOperand2) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4 + offset20] = ((((usqInt) addressOperand2) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5 + offset20] = ((((usqInt) addressOperand2) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[6 + offset20] = ((((usqInt) addressOperand2) >> 32) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[7 + offset20] = ((((usqInt) addressOperand2) >> 40) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[8 + offset20] = ((((usqInt) addressOperand2) >> 48) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[9 + offset20] = ((((usqInt) addressOperand2) >> 56) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[0 + offset21] = 72; + ((self_in_dispatchConcretize->machineCode))[1 + offset21] = 160; + ((self_in_dispatchConcretize->machineCode))[2 + offset21] = (addressOperand2 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3 + offset21] = ((((usqInt) addressOperand2) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4 + offset21] = ((((usqInt) addressOperand2) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5 + offset21] = ((((usqInt) addressOperand2) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[6 + offset21] = ((((usqInt) addressOperand2) >> 32) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[7 + offset21] = ((((usqInt) addressOperand2) >> 40) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[8 + offset21] = ((((usqInt) addressOperand2) >> 48) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[9 + offset21] = ((((usqInt) addressOperand2) >> 56) & 0xFF); if (reg20 == RAX) { ((self_in_dispatchConcretize->machineCodeSize) = 10); return; @@ -19437,23 +19463,23 @@ return; } if (reg21 == RAX) { - offset21 = 0; + offset22 = 0; } else { ((self_in_dispatchConcretize->machineCode))[0] = (rexRxb(self_in_dispatchConcretize, 0, 0, reg21)); ((self_in_dispatchConcretize->machineCode))[1] = (144 + (reg21 % 8)); - offset21 = 2; + offset22 = 2; } - ((self_in_dispatchConcretize->machineCode))[0 + offset21] = 72; - ((self_in_dispatchConcretize->machineCode))[1 + offset21] = 162; - ((self_in_dispatchConcretize->machineCode))[2 + offset21] = (addressOperand3 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3 + offset21] = ((((usqInt) addressOperand3) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4 + offset21] = ((((usqInt) addressOperand3) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[5 + offset21] = ((((usqInt) addressOperand3) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[6 + offset21] = ((((usqInt) addressOperand3) >> 32) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[7 + offset21] = ((((usqInt) addressOperand3) >> 40) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[8 + offset21] = ((((usqInt) addressOperand3) >> 48) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[9 + offset21] = ((((usqInt) addressOperand3) >> 56) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[0 + offset22] = 72; + ((self_in_dispatchConcretize->machineCode))[1 + offset22] = 162; + ((self_in_dispatchConcretize->machineCode))[2 + offset22] = (addressOperand3 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3 + offset22] = ((((usqInt) addressOperand3) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4 + offset22] = ((((usqInt) addressOperand3) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5 + offset22] = ((((usqInt) addressOperand3) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[6 + offset22] = ((((usqInt) addressOperand3) >> 32) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[7 + offset22] = ((((usqInt) addressOperand3) >> 40) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[8 + offset22] = ((((usqInt) addressOperand3) >> 48) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[9 + offset22] = ((((usqInt) addressOperand3) >> 56) & 0xFF); if (reg21 == RAX) { ((self_in_dispatchConcretize->machineCodeSize) = 10); return; @@ -20041,16 +20067,15 @@ ((self_in_dispatchConcretize->machineCodeSize) = 2); return; } - assert(isSignExtendedFourByteValue(self_in_dispatchConcretize, value4)); - ((self_in_dispatchConcretize->machineCode))[0] = 104; - ((self_in_dispatchConcretize->machineCode))[1] = (value4 & 0xFF); - ((self_in_dispatchConcretize->machineCode))[2] = ((((usqInt) value4) >> 8) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) value4) >> 16) & 0xFF); - ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) value4) >> 24) & 0xFF); - ((self_in_dispatchConcretize->machineCodeSize) = 5); - return; - - case PushCw: + if (is32BitSignedImmediate(self_in_dispatchConcretize, value4)) { + ((self_in_dispatchConcretize->machineCode))[0] = 104; + ((self_in_dispatchConcretize->machineCode))[1] = (value4 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[2] = ((((usqInt) value4) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) value4) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) value4) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCodeSize) = 5); + return; + } /* begin concretizePushCw */ value7 = ((self_in_dispatchConcretize->operands))[0]; if ((addressIsInInstructions(((AbstractInstruction *) value7))) @@ -20088,6 +20113,44 @@ ((self_in_dispatchConcretize->machineCodeSize) = 12); return; + case PushCw: + /* begin concretizePushCw */ + value8 = ((self_in_dispatchConcretize->operands))[0]; + if ((addressIsInInstructions(((AbstractInstruction *) value8))) + || ((((AbstractInstruction *) value8)) == (methodLabel()))) { + value8 = ((((AbstractInstruction *) value8))->address); + } + if (addressIsInCurrentCompilation(value8)) { + offset17 = value8 - (((self_in_dispatchConcretize->address)) + 7); + ((self_in_dispatchConcretize->machineCode))[0] = (rexRxb(self_in_dispatchConcretize, RISCTempReg, 0, 0)); + ((self_in_dispatchConcretize->machineCode))[1] = 141; + ((self_in_dispatchConcretize->machineCode))[2] = (modRMRO(self_in_dispatchConcretize, ModRegInd, 5, RISCTempReg)); + ((self_in_dispatchConcretize->machineCode))[3] = (offset17 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) offset17) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) offset17) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[6] = ((((usqInt) offset17) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[7] = 65; + ((self_in_dispatchConcretize->machineCode))[8] = (72 + RISCTempReg); + ((self_in_dispatchConcretize->machineCodeSize) = 9); + return; + } + ((self_in_dispatchConcretize->machineCode))[0] = (rexRxb(self_in_dispatchConcretize, RISCTempReg, 0, RISCTempReg)); + ((self_in_dispatchConcretize->machineCode))[1] = (184 + (RISCTempReg & 7)); + ((self_in_dispatchConcretize->machineCode))[2] = (value8 & 0xFF); + ((self_in_dispatchConcretize->machineCode))[3] = ((((usqInt) value8) >> 8) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[4] = ((((usqInt) value8) >> 16) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[5] = ((((usqInt) value8) >> 24) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[6] = ((((usqInt) value8) >> 32) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[7] = ((((usqInt) value8) >> 40) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[8] = ((((usqInt) value8) >> 48) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[9] = ((((usqInt) value8) >> 56) & 0xFF); + ((self_in_dispatchConcretize->machineCode))[10] = 65; + ((self_in_dispatchConcretize->machineCode))[11] = (72 + RISCTempReg); + assert(RISCTempReg >= 8); + assert((modRMRO(self_in_dispatchConcretize, ModReg, 0, 0)) > 87); + ((self_in_dispatchConcretize->machineCodeSize) = 12); + return; + case PrefetchAw: concretizePrefetchAw(self_in_dispatchConcretize); return; @@ -20626,6 +20689,11 @@ } } + +/* Top 32 bits all the same as the bottom 32 bits' sign bit implies we can + use a sign-extended 4 byte offset. + */ + /* CogX64Compiler>>#is32BitSignedImmediate: */ static sqInt NoDbgRegParms is32BitSignedImmediate(AbstractInstruction * self_in_is32BitSignedImmediate, sqInt a64BitUnsignedOperand) @@ -20686,17 +20754,6 @@ } -/* Top 32 bits all the same as the bottom 32 bits' sign bit implies we can - use a sign-extended 4 byte offset. */ - - /* CogX64Compiler>>#isSignExtendedFourByteValue: */ -static sqInt NoDbgRegParms -isSignExtendedFourByteValue(AbstractInstruction * self_in_isSignExtendedFourByteValue, sqInt unsigned64BitValue) -{ - return (((((sqInt) unsigned64BitValue) >> 32) + 1) ^ 1) == ((((usqInt) unsigned64BitValue) >> 0x1F) & 1); -} - - /* Answer if an address can be accessed using the offset in a MoveMw:r:R: or similar instruction. We assume this is true for 32-bit processors and expect 64-bit processors @@ -24432,8 +24489,6 @@ static sqInt NoDbgRegParms compileAbstractInstructionsFromthrough(sqInt start, sqInt end) { - AbstractInstruction *abstractInstruction; - sqInt debugBytecodePointers; BytecodeDescriptor *descriptor; BytecodeFixup *fixup; sqInt generateBranchAround; @@ -24443,45 +24498,26 @@ traceSimStack(); bytecodePC = start; - nExts = 0; + nExts = (result = 0); descriptor = null; deadCode = 0; while (1) { - - /* If there's no fixup following a return there's no jump to that code and it is dead. */ fixup = fixupAt(bytecodePC - initialPC); - if ((descriptor != null) - && ((descriptor->isReturn))) { - deadCode = 1; - } mergeWithFixupIfRequired(fixup); - byte0 = (fetchByteofObject(bytecodePC, methodObj)) + bytecodeSetOffset; - descriptor = generatorAt(byte0); - loadSubsequentBytesForDescriptorat(descriptor, bytecodePC); + /* begin assertCorrectSimStackPtr */ + descriptor = loadBytesAndGetDescriptor(); nextOpcodeIndex = opcodeIndex; - if (deadCode) { - - /* insert nops for dead code that is mapped so that bc to mc mapping is not many to one */ - if (((descriptor->isMapped)) - || (inBlock - && ((descriptor->isMappedInBlock)))) { - /* begin annotateBytecode: */ - abstractInstruction = gen(Nop); - (abstractInstruction->annotation = HasBytecodePC); - } - result = 0; - } - else { - result = ((descriptor->generator))(); - } + result = (deadCode + ? mapDeadDescriptorIfNeeded(descriptor) + : ((descriptor->generator))()); + /* begin assertExtsAreConsumed: */ if (!((descriptor->isExtension))) { - - /* extended bytecodes must consume their extensions */ assert((extA == 0) && (extB == 0)); } traceDescriptor(descriptor); traceSimStack(); + /* begin patchFixupTargetIfNeeded:nextOpcodeIndex: */ if ((((((usqInt)((fixup->targetInstruction)))) >= NeedsNonMergeFixupFlag) && ((((usqInt)((fixup->targetInstruction)))) <= NeedsMergeFixupFlag))) { /* There is a fixup for this bytecode. It must point to the first generated @@ -27172,6 +27208,9 @@ AbstractInstruction *abstractInstruction1; sqInt offset; + + /* can't fall through */ + deadCode = 1; if (inBlock) { assert(needsFrame); /* begin CallRT: */ @@ -27198,9 +27237,6 @@ : 0); genoperand(RetN, offset); } - - /* can't fall through */ - deadCode = 1; return 0; } @@ -27363,6 +27399,27 @@ return regsSet; } + +/* insert nops for dead code that is mapped so that bc + to mc mapping is not many to one */ + + /* StackToRegisterMappingCogit>>#mapDeadDescriptorIfNeeded: */ +static sqInt NoDbgRegParms +mapDeadDescriptorIfNeeded(BytecodeDescriptor *descriptor) +{ + AbstractInstruction *abstractInstruction; + + flag("annotateInstruction"); + if (((descriptor->isMapped)) + || (inBlock + && ((descriptor->isMappedInBlock)))) { + /* begin annotateBytecode: */ + abstractInstruction = gen(Nop); + (abstractInstruction->annotation = HasBytecodePC); + } + return 0; +} + /* StackToRegisterMappingCogit>>#marshallAbsentReceiverSendArguments: */ static void NoDbgRegParms marshallAbsentReceiverSendArguments(sqInt numArgs) Modified: branches/Cog/nsspur64src/vm/cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.c 2016-04-21 23:51:51 UTC (rev 3677) +++ branches/Cog/nsspur64src/vm/cointerp.c 2016-04-22 18:26:57 UTC (rev 3678) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a from - CoInterpreter VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe + CoInterpreter VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1383,6 +1383,10 @@ static sqInt NoDbgRegParms isEmptyList(sqInt aLinkedList); extern sqInt isFloatObject(sqInt oop); static sqInt NoDbgRegParms isFrameonPage(char *aFrame, StackPage *aPage); +extern sqInt isKindOfInteger(sqInt oop); +extern sqInt isLargeIntegerObject(sqInt oop); +extern sqInt isLargeNegativeIntegerObject(sqInt oop); +extern sqInt isLargePositiveIntegerObject(sqInt oop); static sqInt NoDbgRegParms isLiveContext(sqInt oop); static sqInt NoDbgRegParms isMarriedOrWidowedContext(sqInt aContext); static sqInt NoDbgRegParms isNullExternalPrimitiveCall(sqInt aMethodObj); @@ -1604,8 +1608,8 @@ _iss StackPage * stackPage; _iss sqInt nilObj; _iss sqInt argumentCount; +_iss sqInt bytecodeSetSelector; _iss sqInt specialObjectsOop; -_iss sqInt bytecodeSetSelector; _iss sqInt messageSelector; _iss usqInt instructionPointer; _iss usqInt newMethod; @@ -2430,7 +2434,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1824"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1832"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -61674,7 +61678,7 @@ usqInt prevFree; usqInt prevFreeChunk; usqInt prevPrevFree; - sqInt prevPrevFreeChunk; + usqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; @@ -67088,7 +67092,7 @@ bridgeFromto(SpurSegmentInfo *aSegment, SpurSegmentInfo *nextSegmentOrNil) { usqInt bridgeSpan; - sqInt clifton; + usqInt clifton; usqInt segEnd; segEnd = ((aSegment->segSize)) + ((aSegment->segStart)); @@ -67332,7 +67336,7 @@ sqInt limit; sqInt newEndOfMemory; sqInt next; - usqInt node; + sqInt node; usqInt numSlots; usqInt numSlots1; SpurSegmentInfo *seg; @@ -67675,8 +67679,8 @@ { usqLong firstSavedBridgeWord; sqInt nWritten; - sqInt pier1; - sqInt pier2; + usqInt pier1; + usqInt pier2; usqLong secondSavedBridgeWord; pier1 = (((segment->segSize)) + ((segment->segStart))) - (2 * BaseHeaderSize); @@ -71922,6 +71926,42 @@ } +/* Answer true if the oop is kind of Integer (Small or Large). */ + + /* StackInterpreter>>#isKindOfInteger: */ +sqInt +isKindOfInteger(sqInt oop) +{ + return ((((oop) & 7) == 1)) + || (((oop & (tagMask())) == 0) + && ((((usqInt)(((longAt(oop)) & (classIndexMask())) - ClassLargeNegativeIntegerCompactIndex))) <= 1)); +} + + /* StackInterpreter>>#isLargeIntegerObject: */ +sqInt +isLargeIntegerObject(sqInt oop) +{ + return ((oop & (tagMask())) == 0) + && ((((usqInt)(((longAt(oop)) & (classIndexMask())) - ClassLargeNegativeIntegerCompactIndex))) <= 1); +} + + /* StackInterpreter>>#isLargeNegativeIntegerObject: */ +sqInt +isLargeNegativeIntegerObject(sqInt oop) +{ + return ((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == ClassLargeNegativeIntegerCompactIndex); +} + + /* StackInterpreter>>#isLargePositiveIntegerObject: */ +sqInt +isLargePositiveIntegerObject(sqInt oop) +{ + return ((oop & (tagMask())) == 0) + && (((longAt(oop)) & (classIndexMask())) == ClassLargePositiveIntegerCompactIndex); +} + + /* Answer if the argument, which can be any object, is a live context. */ /* StackInterpreter>>#isLiveContext: */ @@ -77659,8 +77699,8 @@ cnt = ((((max = 128)) < ((len = lengthOfformat(oop, (((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask()))))) ? ((max = 128)) : ((len = lengthOfformat(oop, (((usqInt) (longAt(oop))) >> (formatShift())) & (formatMask()))))); i = 0; if ((isinstanceOfcompactClassIndex(oop, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)ClassByteArray) << (shiftForWord()))), GIV(classByteArrayCompactIndex))) - || ((isinstanceOfcompactClassIndex(oop, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)ClassLargePositiveInteger) << (shiftForWord()))), ClassLargePositiveIntegerCompactIndex)) - || (isinstanceOfcompactClassIndex(oop, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (((long)ClassLargeNegativeInteger) << (shiftForWord()))), ClassLargeNegativeIntegerCompactIndex)))) { + || (((oop & (tagMask())) == 0) + && ((((usqInt)(((longAt(oop)) & (classIndexMask())) - ClassLargeNegativeIntegerCompactIndex))) <= 1))) { while (i < cnt) { printHex(byteAt((oop + BaseHeaderSize) + i)); i += 1; Modified: branches/Cog/nsspur64src/vm/cointerp.h =================================================================== --- branches/Cog/nsspur64src/vm/cointerp.h 2016-04-21 23:51:51 UTC (rev 3677) +++ branches/Cog/nsspur64src/vm/cointerp.h 2016-04-22 18:26:57 UTC (rev 3678) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a */ @@ -272,6 +272,10 @@ extern sqInt headerIndicatesAlternateBytecodeSet(sqInt methodHeader); extern sqInt highBit(usqInt anUnsignedValue); extern sqInt isFloatObject(sqInt oop); +extern sqInt isKindOfInteger(sqInt oop); +extern sqInt isLargeIntegerObject(sqInt oop); +extern sqInt isLargeNegativeIntegerObject(sqInt oop); +extern sqInt isLargePositiveIntegerObject(sqInt oop); extern sqInt isQuickPrimitiveIndex(sqInt anInteger); extern sqInt isReadMediatedContextInstVarIndex(sqInt index); extern sqInt isWriteMediatedContextInstVarIndex(sqInt index); Modified: branches/Cog/nsspur64src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-04-21 23:51:51 UTC (rev 3677) +++ branches/Cog/nsspur64src/vm/gcc3x-cointerp.c 2016-04-22 18:26:57 UTC (rev 3678) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1824 uuid: 3e604324-d371-4ad6-ac2d-8acf325accfe + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1832 uuid: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a from @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1833.mcz
by commits＠source.squeak.org 22 Apr '16

22 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1833.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1833 Author: eem Time: 22 April 2016, 11:15:44.990146 am UUID: 04364d67-49f1-4615-87e7-942001d37706 Ancestors: VMMaker.oscog-eem.1832 The year Ada Lovelace was introduced to Charles Babbage by Mary Somerville. Revise slightly the declaration of the integer type testing macros for internal plugins. Arrange that plugins not using the API are generated as previously. Arrange that external plugins make no assumptions about tag assignments. Fix the speeling of the proxy dereference generator. Fix primAlienReplace to use positiveMachineIntegerValueOf: instead of positive32BitValueOf:. =============== Diff against VMMaker.oscog-eem.1832 =============== Item was changed: ----- Method: IA32ABIPlugin>>primAlienReplace (in category 'primitives-accessing') ----- primAlienReplace "Copy some number of bytes from some source object starting at the index + into the receiver destination object from startIndex to stopIndex. The source + and destination may be Aliens or byte-indexable objects. The primitive wll have + either of the following signatures: - into the receiver destination object from startIndex to stopIndex . The source - and destination may be Aliens or byte-indexable objects. The primitive wll have either - of the following signatures: <Alien | indexableByteSubclass | indexableWordSubclass> primReplaceFrom: start <Integer> to: stop <Integer> with: replacement <Alien | indexableByteSubclass | indexableWordSubclass | Integer> startingAt: repStart <Integer> ^<self> <primitive: 'primitiveAlienReplace' error: errorCode module: 'IA32ABI'> <Anywhere> primReplaceIn: dest <Alien | indexableByteSubclass | indexableWordSubclass> from: start <Integer> to: stop <Integer> with: replacement <Alien | indexableByteSubclass | indexableWordSubclass | Integer> startingAt: repStart <Integer> ^<self> <primitive: 'primitiveAlienReplace' error: errorCode module: 'IA32ABI'> " | array start stop repl replStart dest src totalLength count | <export: true> array := interpreterProxy stackValue: 4. start := interpreterProxy stackIntegerValue: 3. stop := interpreterProxy stackIntegerValue: 2. repl := interpreterProxy stackValue: 1. replStart := interpreterProxy stackIntegerValue: 0. (interpreterProxy failed or: [(interpreterProxy isWordsOrBytes: array) not]) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. (self isAlien: array) ifTrue: [totalLength := self sizeField: array. dest := (self startOfData: array withSize: totalLength) + start - 1. totalLength = 0 "no bounds checks for zero-sized (pointer) Aliens" ifTrue: [totalLength := stop] ifFalse: [totalLength := totalLength abs]] ifFalse: [totalLength := interpreterProxy byteSizeOf: array. dest := (self startOfByteData: array) + start - 1]. + (start >= 1 and: [start - 1 <= stop and: [stop <= totalLength]]) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. - (start >= 1 and: [start - 1 <= stop and: [stop <= totalLength]]) - ifFalse: [^interpreterProxy primitiveFailFor: PrimErrBadIndex]. + (interpreterProxy isKindOfInteger: repl) - (interpreterProxy isIntegerObject: repl) ifTrue: + [src := (interpreterProxy positiveMachineIntegerValueOf: repl) + replStart - 1. + interpreterProxy failed ifTrue: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]] - [(interpreterProxy integerValueOf: repl) <= 0 ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. - src := (interpreterProxy integerValueOf: repl) + replStart - 1] ifFalse: + [(self isAlien: repl) - [(interpreterProxy isLargePositiveIntegerObject: repl) ifTrue: + [totalLength := self sizeField: repl. + src := (self startOfData: repl withSize: totalLength) + replStart - 1. + totalLength = 0 "no bounds checks for zero-sized (pointer) Aliens" + ifTrue: [totalLength := stop - start + replStart] + ifFalse: [totalLength := totalLength abs]] - [src := (interpreterProxy positive32BitValueOf: repl) + replStart - 1. - interpreterProxy failed ifTrue: - [^interpreterProxy primitiveFailFor: PrimErrBadArgument]] ifFalse: + [(interpreterProxy isWordsOrBytes: repl) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. + totalLength := interpreterProxy byteSizeOf: repl. + src := (self startOfByteData: repl) + replStart - 1]. + (replStart >= 1 and: [stop - start + replStart <= totalLength]) ifFalse: + [^interpreterProxy primitiveFailFor: PrimErrBadIndex]]. - [(self isAlien: repl) - ifTrue: - [totalLength := self sizeField: repl. - src := (self startOfData: repl withSize: totalLength) + replStart - 1. - totalLength = 0 "no bounds checks for zero-sized (pointer) Aliens" - ifTrue: [totalLength := stop - start + replStart] - ifFalse: [totalLength := totalLength abs]] - ifFalse: - [(interpreterProxy isWordsOrBytes: repl) ifFalse: - [^interpreterProxy primitiveFailFor: PrimErrBadArgument]. - totalLength := interpreterProxy byteSizeOf: repl. - src := (self startOfByteData: repl) + replStart - 1]. - (replStart >= 1 and: [stop - start + replStart <= totalLength]) ifFalse: - [^interpreterProxy primitiveFailFor: PrimErrBadIndex]]]. (interpreterProxy isOopImmutable: array) ifTrue: [^interpreterProxy primitiveFailFor: PrimErrNoModification]. count := stop - start + 1. + self mem: dest asVoidPointer mo: src asVoidPointer ve: count. - self cCode: 'memmove((void *)dest,(void *)src,count)' - inSmalltalk: - [count := count + src + dest. "squash unused var compiler warnings" - self error: 'not implemented']. interpreterProxy pop: interpreterProxy methodArgumentCount! Item was removed: - ----- Method: VMPluginCodeGenerator>>generateInterpreterProxyFunctionDeference:on:indent: (in category 'C translation') ----- - generateInterpreterProxyFunctionDeference: aNode on: aStream indent: anInteger - | pluginsToClone | - (pluginsToClone := self pluginFunctionsToClone) isEmpty ifTrue: - [^self]. - aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. - pluginsToClone do: - [:s| | cs | - cs := self cFunctionNameFor: s. - self withOptionalVerbiageFor: s - on: aStream - do: [aStream tab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;; cr] - ifOptionalDo: [aStream - nextPutAll: '# if !!defined('; nextPutAll: cs; nextPut: $); - crtab: anInteger; nextPutAll: cs; nextPutAll: ' = 0;'; - cr; nextPutAll: '# endif'; cr]]. - aStream nextPutAll: '#endif /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'.! Item was added: + ----- Method: VMPluginCodeGenerator>>generateInterpreterProxyFunctionDereference:on:indent: (in category 'C translation') ----- + generateInterpreterProxyFunctionDereference: aNode on: aStream indent: anInteger + | pluginsToClone | + pluginsToClone := self pluginFunctionsToClone copyWithoutAll: self selectorsThatAreGeneratedAsMacros. + pluginsToClone isEmpty ifTrue: + [^self]. + aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. + pluginsToClone do: + [:s| | cs | + cs := self cFunctionNameFor: s. + self withOptionalVerbiageFor: s + on: aStream + do: [aStream tab: anInteger; nextPutAll: cs; nextPutAll: ' = interpreterProxy->'; nextPutAll: cs; nextPut: $;; cr] + ifOptionalDo: [aStream + nextPutAll: '# if !!defined('; nextPutAll: cs; nextPut: $); + crtab: anInteger; nextPutAll: cs; nextPutAll: ' = 0;'; + cr; nextPutAll: '# endif'; cr]]. + aStream nextPutAll: '#endif /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'.! Item was changed: ----- Method: VMPluginCodeGenerator>>initializeCTranslationDictionary (in category 'public') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." super initializeCTranslationDictionary. translationDict at: #expandDereferenceInterpreterProxyFunctionTable + put: #generateInterpreterProxyFunctionDereference:on:indent:; - put: #generateInterpreterProxyFunctionDeference:on:indent:; at: #remapOop:in: put: #generateRemapOopIn:on:indent:! Item was changed: ----- Method: VMPluginCodeGenerator>>pluginFunctionsToClone (in category 'public') ----- pluginFunctionsToClone "Answer those of the used plugin functions to clone as a sorted collection. Exclude those that are static to sqVirtualMachine.c and hence always need + to be called through interpreterProxy." - to be called through interpreterProxy. - Also exclude those that are generated as macros rather than function call." ^((pluginFunctionsUsed reject: [:selector| self noteUsedPluginFunction: selector]) + select: [:selector| InterpreterProxy includesSelector: selector]) - select: [:selector| (InterpreterProxy includesSelector: selector) and: [(self selectorsThatAreGeneratedAsMacros includes: selector) not]]) asSortedCollection! Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareInterpreterProxyOn: (in category 'C code generator') ----- preDeclareInterpreterProxyOn: aStream "Put the necessary #defines needed before interpreterProxy. Basically internal plugins use the VM's interpreterProxy variable and external plugins use their own. Override to keep local copies of all functions in external prims, and link directly in internal plugins." "| pcc | pcc := self new. (InterpreterProxy selectors reject: [:s| #(initialize private) includes: (InterpreterProxy whichCategoryIncludesSelector: s)]) do: [:s| pcc noteUsedPluginFunction: s]. pcc preDeclareInterpreterProxyOn: Transcript. Transcript flush" | pluginFuncs interpreterClass objectMemoryClass | self notePluginFunctionsUsedByMacros. - self preDeclareMacrosForFastClassCheckingOn: aStream. (pluginFuncs := self pluginFunctionsToClone) isEmpty ifTrue: [^super preDeclareInterpreterProxyOn: aStream]. + (pluginFuncs includesAnyOf: self selectorsThatAreGeneratedAsMacros) ifTrue: + [self preDeclareMacrosForFastClassCheckingOn: aStream]. + pluginFuncs := pluginFuncs copyWithoutAll: self selectorsThatAreGeneratedAsMacros. + pluginFuncs isEmpty ifTrue: + [^self]. - aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. interpreterClass := self referenceInterpreterClass. objectMemoryClass := self referenceObjectMemoryClass. pluginFuncs := pluginFuncs collect: [:selector| | reference actual | reference := self compileToTMethodSelector: selector in: ((interpreterClass whichClassIncludesSelector: selector) ifNil: [(objectMemoryClass whichClassIncludesSelector: selector) ifNil: [InterpreterProxy]]). actual := self compileToTMethodSelector: selector in: InterpreterProxy. (reference returnType ~= actual returnType or: [(1 to: reference args size) anySatisfy: [:i| (reference typeFor: (reference args at: i) in: self) ~= (actual typeFor: (actual args at: i) in: self)]]) ifTrue: [self logger nextPutAll: 'warning, signature of InterpreterProxy>>'; nextPutAll: selector; nextPutAll: ' does not match reference implementation.'; cr]. actual]. pluginFuncs do: [:tMethod| tMethod recordDeclarationsIn: self. tMethod returnType ifNil: [tMethod inferReturnTypeIn: self]]. pluginFuncs do: [:tMethod| | functionName | functionName := self cFunctionNameFor: tMethod selector. aStream nextPutAll: ((String streamContents: [:s| tMethod static: true; emitCFunctionPrototype: s generator: self]) copyReplaceAll: functionName with: '(*', functionName, ')' tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]])]. aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'; cr. pluginFuncs do: [:tMethod| + self withGuardAgainstDefinitionOf: tMethod selector on: aStream do: + [self withOptionalVerbiageFor: tMethod selector + on: aStream + do: [tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self] + ifOptionalDo: + [aStream nextPutAll: '# define '. + (TSendNode new + setSelector: tMethod selector + receiver: (TVariableNode new setName: 'interpreterProxy') + arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) + emitCCodeAsArgumentOn: aStream + level: 0 + generator: self. + aStream nextPutAll: ' 0'; cr]]]. + aStream nextPutAll: 'extern'; cr; nextPutAll: '#endif'; cr! - self withOptionalVerbiageFor: tMethod selector - on: aStream - do: [tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self] - ifOptionalDo: - [aStream nextPutAll: '# define '. - (TSendNode new - setSelector: tMethod selector - receiver: (TVariableNode new setName: 'interpreterProxy') - arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) - emitCCodeAsArgumentOn: aStream - level: 0 - generator: self. - aStream nextPutAll: ' 0'; cr]]. - aStream nextPutAll: 'extern'; cr; nextPutAll: '#endif'; cr.! Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareMacrosForFastClassCheckingOn: (in category 'C code generator') ----- preDeclareMacrosForFastClassCheckingOn: aStream + "These macros can be used to check for various cases of Integer types. + Since they can be defined based on existing API, this is a good trade off: + - avoid extending the interpreterProxy API unnecessarily + - provide fast type checking" - "These macros can be used to check for various case of Integer type. - Since they can be defined based on existing API, this is a good trade off: - - avoid extending the interpreterProxy API like mad - - provide fast type checking" + "Speed-up generated code for internal plugins by using macros and fixed class indices to define this well known functionality." + #( '#if defined(SQUEAK_BUILTIN_PLUGIN)' cr - "Fast-up generated code by using a macro for this well known function unconditionnally" - #( '#define isIntegerObject(oop) (oop & 1)' cr - '#if SPURVM && defined(SQUEAK_BUILTIN_PLUGIN)' + '# define isIntegerObject(oop) ((oop) & 1)' cr + + '# if SPURVM' - "Compact class index are hardcoded because there is no guarantee that the pool values at generation time are that of SPUR.. - Make sure they are in sync with SpurMemoryManager class>>initializeCompactClassIndices" 'extern sqInt classIndexOf(sqInt);' + "Compact class indices are hardcoded here because there is no guarantee that the pool values at generation time + are that of SPUR.. Make sure they are in sync with SpurMemoryManager class>>initializeCompactClassIndices" + '# define LargeNegativeIntegerClassIndex 32' + '# define LargePositiveIntegerClassIndex 33' + '# if BytesPerOop == 4' + '# define isImmediate(oop) ((oop) & 3)' + '# else' + '# define isImmediate(oop) ((oop) & 7)' + '# endif' + '# define isKindOfInteger(oop) (isImmediate(oop) ? isIntegerObject(oop) : (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' + '# define isLargeIntegerObject(oop) (!!isImmediate(oop) && (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' + '# define isLargeNegativeIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargeNegativeIntegerClassIndex)' + '# define isLargePositiveIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargePositiveIntegerClassIndex)' + '# endif /* SPURVM */' + '#endif /* defined(SQUEAK_BUILTIN_PLUGIN) */' cr - '# define LargeNegativeIntegerClassIndex 32' - '# define LargePositiveIntegerClassIndex 33' - '# define isKindOfInteger(oop) (isImmediate(oop) ? isIntegerObject(oop) : (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' - '# define isLargeIntegerObject(oop) (!!isImmediate(oop) && (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' - '# define isLargeNegativeIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargeNegativeIntegerClassIndex)' - '# define isLargePositiveIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargePositiveIntegerClassIndex)' + "If the functionality has not been defined via macros, define default versions using existing plugin API" + '#if !!defined(isKindOfInteger)' - '#else /* defined(SQUEAK_BUILTIN_PLUGIN) && defined(SPURVM) */' - '# define isLargeNegativeIntegerObject(oop) (fetchClassOf(oop) == classLargeNegativeInteger())' '# define isLargePositiveIntegerObject(oop) (fetchClassOf(oop) == classLargePositiveInteger())' '# define isLargeIntegerObject(oop) (isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))' '# define isKindOfInteger(oop) (isIntegerObject(oop) || isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))' + '#endif' cr) do: - - '#endif /* defined(SQUEAK_BUILTIN_PLUGIN) && defined(SPURVM) */' cr) do: [:element| aStream cr. + element ~~ #cr ifTrue: [aStream nextPutAll: element]]! - element ~~ #cr ifTrue: [aStream cr; nextPutAll: element]]! Item was changed: ----- Method: VMPluginCodeGenerator>>selectorsThatAreGeneratedAsMacros (in category 'public') ----- selectorsThatAreGeneratedAsMacros "Answer a list of selectors that are generated as a C macro rather than as an interpreterProxy function call." + ^#(isKindOfInteger: isLargeIntegerObject: isLargeNegativeIntegerObject: isLargePositiveIntegerObject:)! - ^#(isKindOfInteger: isIntegerObject: isLargeIntegerObject: isLargeNegativeIntegerObject: isLargePositiveIntegerObject:)! Item was added: + ----- Method: VMPluginCodeGenerator>>selectorsThatMayBeGeneratedAsMacros (in category 'public') ----- + selectorsThatMayBeGeneratedAsMacros + "Answer a list of selectors that maybe generated as a C macro rather than as an interpreterProxy function call." + + ^self selectorsThatAreGeneratedAsMacros, #(isIntegerObject: isImmediate:)! Item was added: + ----- Method: VMPluginCodeGenerator>>withGuardAgainstDefinitionOf:on:do: (in category 'C translation') ----- + withGuardAgainstDefinitionOf: selector on: aStream do: aBlock + "Evaluate aBlock, surrounded by a define if selector is defined as a macro (i.e. by preDeclareInterpreterProxyOn:" + (self selectorsThatMayBeGeneratedAsMacros includes: selector) ifFalse: + [^aBlock value]. + aStream nextPutAll: '#if !!defined('; nextPutAll: (self cFunctionNameFor: selector); nextPut: $); cr. + aBlock value. + aStream nextPutAll: '#endif'; cr!

1 0

VM Maker: VMMaker.oscog-eem.1832.mcz
by commits＠source.squeak.org 22 Apr '16

22 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1832.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1832 Author: eem Time: 21 April 2016, 5:03:03.826813 pm UUID: 3e4d6e88-f60d-4a01-930d-7c5895b8a86a Ancestors: VMMaker.oscog-eem.1831 Do that rename. I wanna generate sources :-) =============== Diff against VMMaker.oscog-eem.1831 =============== Item was changed: ----- Method: VMPluginCodeGenerator>>preDeclareInterpreterProxyOn: (in category 'C code generator') ----- preDeclareInterpreterProxyOn: aStream "Put the necessary #defines needed before interpreterProxy. Basically internal plugins use the VM's interpreterProxy variable and external plugins use their own. Override to keep local copies of all functions in external prims, and link directly in internal plugins." "| pcc | pcc := self new. (InterpreterProxy selectors reject: [:s| #(initialize private) includes: (InterpreterProxy whichCategoryIncludesSelector: s)]) do: [:s| pcc noteUsedPluginFunction: s]. pcc preDeclareInterpreterProxyOn: Transcript. Transcript flush" | pluginFuncs interpreterClass objectMemoryClass | self notePluginFunctionsUsedByMacros. + self preDeclareMacrosForFastClassCheckingOn: aStream. - self preDeclareMacrosForFastClassChekingOn: aStream. (pluginFuncs := self pluginFunctionsToClone) isEmpty ifTrue: [^super preDeclareInterpreterProxyOn: aStream]. aStream cr; nextPutAll: '#if !!defined(SQUEAK_BUILTIN_PLUGIN)'; cr. interpreterClass := self referenceInterpreterClass. objectMemoryClass := self referenceObjectMemoryClass. pluginFuncs := pluginFuncs collect: [:selector| | reference actual | reference := self compileToTMethodSelector: selector in: ((interpreterClass whichClassIncludesSelector: selector) ifNil: [(objectMemoryClass whichClassIncludesSelector: selector) ifNil: [InterpreterProxy]]). actual := self compileToTMethodSelector: selector in: InterpreterProxy. (reference returnType ~= actual returnType or: [(1 to: reference args size) anySatisfy: [:i| (reference typeFor: (reference args at: i) in: self) ~= (actual typeFor: (actual args at: i) in: self)]]) ifTrue: [self logger nextPutAll: 'warning, signature of InterpreterProxy>>'; nextPutAll: selector; nextPutAll: ' does not match reference implementation.'; cr]. actual]. pluginFuncs do: [:tMethod| tMethod recordDeclarationsIn: self. tMethod returnType ifNil: [tMethod inferReturnTypeIn: self]]. pluginFuncs do: [:tMethod| | functionName | functionName := self cFunctionNameFor: tMethod selector. aStream nextPutAll: ((String streamContents: [:s| tMethod static: true; emitCFunctionPrototype: s generator: self]) copyReplaceAll: functionName with: '(*', functionName, ')' tokenish: [:ch| ch = $_ or: [ch isAlphaNumeric]])]. aStream nextPutAll: '#else /* !!defined(SQUEAK_BUILTIN_PLUGIN) */'; cr. pluginFuncs do: [:tMethod| self withOptionalVerbiageFor: tMethod selector on: aStream do: [tMethod static: false; export: false; emitCFunctionPrototype: aStream generator: self] ifOptionalDo: [aStream nextPutAll: '# define '. (TSendNode new setSelector: tMethod selector receiver: (TVariableNode new setName: 'interpreterProxy') arguments: (tMethod args collect: [:a| TVariableNode new setName: a])) emitCCodeAsArgumentOn: aStream level: 0 generator: self. aStream nextPutAll: ' 0'; cr]]. aStream nextPutAll: 'extern'; cr; nextPutAll: '#endif'; cr.! Item was added: + ----- Method: VMPluginCodeGenerator>>preDeclareMacrosForFastClassCheckingOn: (in category 'C code generator') ----- + preDeclareMacrosForFastClassCheckingOn: aStream + "These macros can be used to check for various case of Integer type. + Since they can be defined based on existing API, this is a good trade off: + - avoid extending the interpreterProxy API like mad + - provide fast type checking" + + "Fast-up generated code by using a macro for this well known function unconditionnally" + #( '#define isIntegerObject(oop) (oop & 1)' cr + '#if SPURVM && defined(SQUEAK_BUILTIN_PLUGIN)' + + "Compact class index are hardcoded because there is no guarantee that the pool values at generation time are that of SPUR.. + Make sure they are in sync with SpurMemoryManager class>>initializeCompactClassIndices" + 'extern sqInt classIndexOf(sqInt);' + '# define LargeNegativeIntegerClassIndex 32' + '# define LargePositiveIntegerClassIndex 33' + '# define isKindOfInteger(oop) (isImmediate(oop) ? isIntegerObject(oop) : (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' + '# define isLargeIntegerObject(oop) (!!isImmediate(oop) && (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)' + '# define isLargeNegativeIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargeNegativeIntegerClassIndex)' + '# define isLargePositiveIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargePositiveIntegerClassIndex)' + + '#else /* defined(SQUEAK_BUILTIN_PLUGIN) && defined(SPURVM) */' + + '# define isLargeNegativeIntegerObject(oop) (fetchClassOf(oop) == classLargeNegativeInteger())' + '# define isLargePositiveIntegerObject(oop) (fetchClassOf(oop) == classLargePositiveInteger())' + '# define isLargeIntegerObject(oop) (isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))' + '# define isKindOfInteger(oop) (isIntegerObject(oop) || isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))' + + '#endif /* defined(SQUEAK_BUILTIN_PLUGIN) && defined(SPURVM) */' cr) do: + [:element| + aStream cr. + element ~~ #cr ifTrue: [aStream cr; nextPutAll: element]]! Item was removed: - ----- Method: VMPluginCodeGenerator>>preDeclareMacrosForFastClassChekingOn: (in category 'C code generator') ----- - preDeclareMacrosForFastClassChekingOn: aStream - "These macros can be used to check for various case of Integer type. - Since they can be defined based on existing API, this is a good trade off: - - avoid extending the interpreterProxy API like mad - - provide fast type checking" - - "Fast-up generated code by using a macro for this well known function unconditionnally" - aStream cr; nextPutAll: '#define isIntegerObject(oop) (oop & 1)'; cr. - - aStream cr; nextPutAll: '#if SPURVM && defined(SQUEAK_BUILTIN_PLUGIN)'. - - "Compact class index are hardcoded because there is no guaranty that the pool values at generation time are that of SPUR.. - Make sure they are in sync with SpurMemoryManager class>>initializeCompactClassIndices" - aStream cr; nextPutAll: '# define LargeNegativeIntegerClassIndex 32'. - aStream cr; nextPutAll: '# define LargePositiveIntegerClassIndex 33'. - aStream cr; nextPutAll: 'extern sqInt classIndexOf(sqInt);'. - aStream cr; nextPutAll: '# define isKindOfInteger(oop) (isImmediate(oop) ? isIntegerObject(oop) : (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)'. - aStream cr; nextPutAll: '# define isLargeIntegerObject(oop) (!!isImmediate(oop) && (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)'. - aStream cr; nextPutAll: '# define isLargeNegativeIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargeNegativeIntegerClassIndex)'. - aStream cr; nextPutAll: '# define isLargePositiveIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargePositiveIntegerClassIndex)'. - - aStream cr; nextPutAll: '#else /* defined(SQUEAK_BUILTIN_PLUGIN) && defined(SPURVM) */'. - - aStream cr; nextPutAll: '# define isLargeNegativeIntegerObject(oop) (fetchClassOf(oop) == classLargeNegativeInteger())'. - aStream cr; nextPutAll: '# define isLargePositiveIntegerObject(oop) (fetchClassOf(oop) == classLargePositiveInteger())'. - aStream cr; nextPutAll: '# define isLargeIntegerObject(oop) (isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))'. - aStream cr; nextPutAll: '# define isKindOfInteger(oop) (isIntegerObject(oop) || isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))'. - - aStream cr; nextPutAll: '#endif /* defined(SQUEAK_BUILTIN_PLUGIN) && defined(SPURVM) */'; cr - !

1 0

[commit][3677] Checking in the merge that undoes Nicolas' changes to sqVirtualMachine.[ch]
by commits＠squeakvm.org 22 Apr '16

22 Apr '16

Revision: 3677 Author: eliot Date: 2016-04-21 16:51:51 -0700 (Thu, 21 Apr 2016) Log Message: ----------- Checking in the merge that undoes Nicolas' changes to sqVirtualMachine.[ch] Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu Apr 21 16:42:14 PDT 2016 + Thu Apr 21 16:51:03 PDT 2016

1 0

[commit][3676] Attempting merge.
by commits＠squeakvm.org 22 Apr '16

22 Apr '16

Revision: 3676 Author: eliot Date: 2016-04-21 16:43:36 -0700 (Thu, 21 Apr 2016) Log Message: ----------- Attempting merge. All is black as mud. Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Apr 19 17:31:02 PDT 2016 + Thu Apr 21 16:42:14 PDT 2016

1 0

latest VMMaker breaks tests in Pharo
by Esteban Lorenzano 22 Apr '16

22 Apr '16

Hi, In concrete this ones: IntegerTest>>#testIsPrime IntegerTest>>#testIsPrime2 IntegerTest>>#testIsProbablyPrime AlienSunit>>#testLong AlienSunit>>#testLongAccessors I suspect this is a common failure and not a Pharo specific issue (since nothing we change could remotely affect longs, I think) any idea? cheers, Esteban

3 4

Re: [Vm-dev] VM Maker: VMMaker.oscog-nice.1830.mcz
by Levente Uzonyi 22 Apr '16

22 Apr '16

On Thu, 21 Apr 2016, commits(a)source.squeak.org wrote: > > Nicolas Cellier uploaded a new version of VMMaker to project VM Maker: > http://source.squeak.org/VMMaker/VMMaker.oscog-nice.1830.mcz > snip > + ----- Method: VMPluginCodeGenerator>>preDeclareMacrosForFastClassChekingOn: (in category 'C code generator') ----- > + preDeclareMacrosForFastClassChekingOn: aStream > + "These macros can be used to check for various case of Integer type. > + Since they can be defined based on existing API, this is a good trade off: > + - avoid extending the interpreterProxy API like mad > + - provide fast type checking" > + > + "Fast-up generated code by using a macro for this well known function unconditionnally" > + aStream cr; nextPutAll: '#define isIntegerObject(oop) (oop & 1)'; cr. > + > + aStream cr; nextPutAll: '#if SPURVM && defined(SQUEAK_BUILTIN_PLUGIN)'. > + > + "Compact class index are hardcoded because there is no guaranty that the pool values at generation time are that of SPUR.. > + Make sure they are in sync with SpurMemoryManager class>>initializeCompactClassIndices" > + aStream cr; nextPutAll: '# define LargeNegativeIntegerClassIndex 32'. > + aStream cr; nextPutAll: '# define LargePositiveIntegerClassIndex 33'. > + aStream cr; nextPutAll: 'extern sqInt classIndexOf(sqInt);'. > + aStream cr; nextPutAll: '# define isKindOfInteger(oop) (isImmediate(oop) ? isIntegerObject(oop) : (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)'. > + aStream cr; nextPutAll: '# define isLargeIntegerObject(oop) (!!isImmediate(oop) && (unsigned)(classIndexOf(oop) - LargeNegativeIntegerClassIndex) <= 1)'. > + aStream cr; nextPutAll: '# define isLargeNegativeIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargeNegativeIntegerClassIndex)'. > + aStream cr; nextPutAll: '# define isLargePositiveIntegerObject(oop) (!!isImmediate(oop) && classIndexOf(oop) == LargePositiveIntegerClassIndex)'. > + > + aStream cr; nextPutAll: '#else /* defined(SQUEAK_BUILTIN_PLUGIN) && defined(SPURVM) */'. These macros look pretty good. I wonder if we can have more, e.g. #classIndexOf:. IIRC that's part of the object header in Spur. If so, then we could use a macro for that as well, couldn't we? Btw, the comment here and below don't match the actual #if. Also, there's a "c" missing from the name of the method: Cheking vs Checking. Levente > + > + aStream cr; nextPutAll: '# define isLargeNegativeIntegerObject(oop) (fetchClassOf(oop) == classLargeNegativeInteger())'. > + aStream cr; nextPutAll: '# define isLargePositiveIntegerObject(oop) (fetchClassOf(oop) == classLargePositiveInteger())'. > + aStream cr; nextPutAll: '# define isLargeIntegerObject(oop) (isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))'. > + aStream cr; nextPutAll: '# define isKindOfInteger(oop) (isIntegerObject(oop) || isLargeNegativeIntegerObject(oop) || isLargePositiveIntegerObject(oop))'. > + > + aStream cr; nextPutAll: '#endif /* defined(SQUEAK_BUILTIN_PLUGIN) && defined(SPURVM) */'; cr > + ! > > Item was added: > + ----- Method: VMPluginCodeGenerator>>selectorsThatAreGeneratedAsMacros (in category 'public') ----- > + selectorsThatAreGeneratedAsMacros > + "Answer a list of selectors that are generated as a C macro rather than as an interpreterProxy function call." > + > + ^#(isKindOfInteger: isIntegerObject: isLargeIntegerObject: isLargeNegativeIntegerObject: isLargePositiveIntegerObject:)! > >

3 2

VM Maker: VMMaker.oscog-eem.1831.mcz
by commits＠source.squeak.org 22 Apr '16

22 Apr '16

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1831.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1831 Author: eem Time: 21 April 2016, 4:25:31.011425 pm UUID: beed3fdd-2d6b-44ae-a973-f30b4dfa61e5 Ancestors: VMMaker.oscog-nice.1830 64-bit Cogit: is32BitSignedImmediate: & isSignExtendedFourByteValue: are the same; we only need one. =============== Diff against VMMaker.oscog-nice.1830 =============== Item was changed: ----- Method: CogInLineLiteralsX64Compiler>>computeSizeOfArithCqR (in category 'generate machine code') ----- computeSizeOfArithCqR "With CqR we assume constants are 32-bits or less." <inline: true> (self isQuick: (operands at: 0)) ifTrue: [^4]. + (self is32BitSignedImmediate: (operands at: 0)) ifTrue: - (self isSignExtendedFourByteValue: (operands at: 0)) ifTrue: [^(operands at: 1) = RAX ifTrue: [6] ifFalse: [7]]. ^10 "movabsq" + 3 "r op r"! Item was changed: ----- Method: CogX64Compiler>>computeMaximumSize (in category 'generate machine code') ----- (excessive size, no diff calculated) Item was changed: ----- Method: CogX64Compiler>>concretizeArithCqRWithRO:raxOpcode: (in category 'generate machine code') ----- concretizeArithCqRWithRO: regOpcode raxOpcode: raxOpcode "Will get inlined into concretizeAt: switch." <inline: false> | value reg | value := operands at: 0. reg := operands at: 1. machineCode at: 0 put: (self rexR: 0 x: 0 b: reg). (self isQuick: value) ifTrue: [machineCode at: 1 put: 16r83; at: 2 put: (self mod: ModReg RM: reg RO: regOpcode); at: 3 put: (value bitAnd: 16rFF). ^machineCodeSize := 4]. + (self is32BitSignedImmediate: value) ifTrue: - (self isSignExtendedFourByteValue: value) ifTrue: [reg = RAX ifTrue: [machineCode at: 1 put: raxOpcode; at: 2 put: (value bitAnd: 16rFF); at: 3 put: (value >> 8 bitAnd: 16rFF); at: 4 put: (value >> 16 bitAnd: 16rFF); at: 5 put: (value >> 24 bitAnd: 16rFF). ^machineCodeSize := 6]. machineCode at: 1 put: 16r81; at: 2 put: (self mod: ModReg RM: reg RO: regOpcode); at: 3 put: (value bitAnd: 16rFF); at: 4 put: (value >> 8 bitAnd: 16rFF); at: 5 put: (value >> 16 bitAnd: 16rFF); at: 6 put: (value >> 24 bitAnd: 16rFF). ^machineCodeSize := 7]. ^self concretizeArithCwR: (raxOpcode = 16r3D "Cmp" ifTrue: [16r39] ifFalse: [raxOpcode - 2])! Item was changed: ----- Method: CogX64Compiler>>concretizePushCq (in category 'generate machine code') ----- concretizePushCq <inline: true> | value | value := operands at: 0. (self isQuick: value) ifTrue: [machineCode at: 0 put: 16r6A; at: 1 put: (value bitAnd: 16rFF). ^machineCodeSize := 2]. + (self is32BitSignedImmediate: value) ifTrue: - (self isSignExtendedFourByteValue: value) ifTrue: [machineCode at: 0 put: 16r68; at: 1 put: (value bitAnd: 16rFF); at: 2 put: (value >> 8 bitAnd: 16rFF); at: 3 put: (value >> 16 bitAnd: 16rFF); at: 4 put: (value >> 24 bitAnd: 16rFF). ^machineCodeSize := 5]. ^self concretizePushCw! Item was changed: ----- Method: CogX64Compiler>>concretizeTstCqR (in category 'generate machine code') ----- concretizeTstCqR "Will get inlined into concretizeAt: switch." <inline: true> | value reg | value := operands at: 0. reg := operands at: 1. machineCode at: 0 put: (self rexR: 0 x: 0 b: reg). (self isQuick: value) ifTrue: [machineCode at: 1 put: 16rF6; at: 2 put: (self mod: ModReg RM: reg RO: 0); at: 3 put: (value bitAnd: 16rFF). ^machineCodeSize := 4]. + (self is32BitSignedImmediate: value) ifTrue: - (self isSignExtendedFourByteValue: value) ifTrue: [reg = RAX ifTrue: [machineCode at: 1 put: 16rA9; at: 2 put: (value bitAnd: 16rFF); at: 3 put: (value >> 8 bitAnd: 16rFF); at: 4 put: (value >> 16 bitAnd: 16rFF); at: 5 put: (value >> 24 bitAnd: 16rFF). ^machineCodeSize := 6]. machineCode at: 1 put: 16rF7; at: 2 put: (self mod: ModReg RM: reg RO: 0); at: 3 put: (value bitAnd: 16rFF); at: 4 put: (value >> 8 bitAnd: 16rFF); at: 5 put: (value >> 16 bitAnd: 16rFF); at: 6 put: (value >> 24 bitAnd: 16rFF). ^machineCodeSize := 7]. ^self concretizeArithCwR: 16r85! Item was changed: ----- Method: CogX64Compiler>>is32BitSignedImmediate: (in category 'testing') ----- is32BitSignedImmediate: a64BitUnsignedOperand + "Top 32 bits all the same as the bottom 32 bits' sign bit implies we can use a sign-extended 4 byte offset." ^self cCode: [(self cCoerceSimple: a64BitUnsignedOperand to: #int) = (self cCoerceSimple: a64BitUnsignedOperand to: #long)] + inSmalltalk: [((a64BitUnsignedOperand >> 32) signedIntFromLong + 1 bitXor: 1) = (a64BitUnsignedOperand >> 31 bitAnd: 1)]! - inSmalltalk: [((a64BitUnsignedOperand >> 32) signedIntFromLong between: -1 and: 0) - and: [(a64BitUnsignedOperand >> 31) signedIntFromLong between: -1 and: 0]]! Item was removed: - ----- Method: CogX64Compiler>>isSignExtendedFourByteValue: (in category 'testing') ----- - isSignExtendedFourByteValue: unsigned64BitValue - "Top 32 bits all the same as the bottom 32 bits' sign bit implies we can use a sign-extended 4 byte offset." - ^((self cCode: [unsigned64BitValue >>> 32] - inSmalltalk: [(unsigned64BitValue >> 32) signedIntFromLong]) + 1 bitXor: 1) = (unsigned64BitValue >> 31 bitAnd: 1)!

1 0

[commit][3675] Revert latest API change which did not respect versionning rules.
by commits＠squeakvm.org 22 Apr '16

22 Apr '16

Revision: 3675 Author: nice Date: 2016-04-21 15:07:24 -0700 (Thu, 21 Apr 2016) Log Message: ----------- Revert latest API change which did not respect versionning rules. These API are now replaced by macros. Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqVirtualMachine.c branches/Cog/platforms/Cross/vm/sqVirtualMachine.h Modified: branches/Cog/platforms/Cross/vm/sqVirtualMachine.c =================================================================== --- branches/Cog/platforms/Cross/vm/sqVirtualMachine.c 2016-04-20 00:32:46 UTC (rev 3674) +++ branches/Cog/platforms/Cross/vm/sqVirtualMachine.c 2016-04-21 22:07:24 UTC (rev 3675) @@ -65,10 +65,6 @@ sqInt isBytes(sqInt oop); sqInt isFloatObject(sqInt oop); sqInt isIndexable(sqInt oop); -sqInt isKindOfInteger(sqInt oop); -sqInt isLargeIntegerObject(sqInt oop); -sqInt isLargePositiveIntegerObject(sqInt oop); -sqInt isLargeNegativeIntegerObject(sqInt oop); sqInt isIntegerObject(sqInt oop); sqInt isIntegerValue(sqInt intValue); sqInt isPointers(sqInt oop); @@ -333,10 +329,6 @@ VM->isBytes = isBytes; VM->isFloatObject = isFloatObject; VM->isIndexable = isIndexable; - VM->isKindOfInteger = isKindOfInteger; - VM->isLargeIntegerObject = isLargeIntegerObject; - VM->isLargePositiveIntegerObject = isLargePositiveIntegerObject; - VM->isLargeNegativeIntegerObject = isLargeNegativeIntegerObject; VM->isIntegerObject = isIntegerObject; VM->isIntegerValue = isIntegerValue; VM->isPointers = isPointers; Modified: branches/Cog/platforms/Cross/vm/sqVirtualMachine.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqVirtualMachine.h 2016-04-20 00:32:46 UTC (rev 3674) +++ branches/Cog/platforms/Cross/vm/sqVirtualMachine.h 2016-04-21 22:07:24 UTC (rev 3675) @@ -111,10 +111,6 @@ sqInt (*isBytes)(sqInt oop); sqInt (*isFloatObject)(sqInt oop); sqInt (*isIndexable)(sqInt oop); - sqInt (*isKindOfInteger)(sqInt oop); - sqInt (*isLargeIntegerObject)(sqInt oop); - sqInt (*isLargePositiveIntegerObject)(sqInt oop); - sqInt (*isLargeNegativeIntegerObject)(sqInt oop); sqInt (*isIntegerObject)(sqInt oop); sqInt (*isIntegerValue)(sqInt intValue); sqInt (*isPointers)(sqInt oop);

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2016