Vm-dev May 2015

vm-dev@lists.squeakfoundation.org

28 participants
153 discussions

VM Maker: VMMaker.oscog-eem.1311.mcz
by commits＠source.squeak.org 18 May '15

18 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1311.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1311 Author: eem Time: 17 May 2015, 3:16:07.333 pm UUID: 61f8144b-089d-4ca4-9e81-4ccfa6de0fc3 Ancestors: VMMaker.oscog-eem.1310 Fix VMMakerTool dimensions given recent UI changes. I still use the VMMakerTool for outputting a plugin. =============== Diff against VMMaker.oscog-eem.1310 =============== Item was changed: ----- Method: VMMakerTool>>buildCenterRows (in category 'window construction') ----- buildCenterRows | rows color1 color2 | color1 := Color blue veryMuchLighter. color2 := Color green veryMuchLighter. rows := Morph new color: Color transparent; + layoutPolicy: TableLayout new; + vResizing: #spaceFill; + extent: 550 @ (TextStyle defaultFont height * 14); + hResizing: #spaceFill; + listDirection: #topToBottom; - layoutPolicy: TableLayout new; - vResizing: #spaceFill; - extent: 550 @ (TextStyle defaultFont height * 8); - hResizing: #spaceFill; - listDirection: #topToBottom; borderStyle: (BorderStyle complexAltRaised width: 2); + wrapDirection: #none; + wrapCentering: #center; + yourself. - wrapDirection: #none; - wrapCentering: #center; - yourself. rows addMorphBack: ((self entryRowWithLabel: 'Interpreter class name:' balloonText: 'The name of the Interpreter class' getFieldText: #interpreterClassName setFieldText: #interpreterClassName: buttonLabel: nil buttonAction: nil buttonBalloonText: nil) color: color1). interpreterClassMorph := rows submorphs last submorphs first. rows addMorphBack: ((self entryRowWithLabel: 'Path to platforms code:' balloonText: 'The directory where the platform source tree is found; can be edited in text field to the right. Default of {working directory}/src is strongly recommended' getFieldText: #platformsPathText setFieldText: #platformsPathText: buttonLabel: 'Find Path' buttonAction: #findPlatformsPath buttonBalloonText: 'Choose the directory where you keep the platform specific code from a file dialogue') color: color2). platformPathMorph := rows submorphs last submorphs second. rows addMorphBack: ((self entryRowWithLabel: 'Platform name:' balloonText: 'The platform name (as returned by Smalltalk platformName - unix, Mac OS, RISCOS, win32 etc); can be edited (in text field to the right) to cross generate' getFieldText: #platformNameText setFieldText: #platformNameText: buttonLabel: 'Find platform' buttonAction: #platformsListMenu buttonBalloonText: 'Choose from a list of known platforms. The default is this current platform.') color: color1). platformNameMorph := rows submorphs last submorphs second. rows addMorphBack: ((self entryRowWithLabel: 'Path to generated sources' balloonText: 'The directory where the built sources will be placed; can be edited in text field to the right. The default is strongly recommended; makefile alterations may be needed if you use a different path.' getFieldText: #sourcePathText setFieldText: #sourcePathText: buttonLabel: 'Clean out' buttonAction: #cleanoutSrcDir buttonBalloonText: 'Clean out all the files in the target directory, ready for a clean build') color: color2). generatedPathMorph := rows submorphs last submorphs second. ^ rows!

1 0

VM Maker: VMMaker.oscog-eem.1310.mcz
by commits＠source.squeak.org 17 May '15

17 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1310.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1310 Author: eem Time: 17 May 2015, 2:26:38.118 pm UUID: 91e78d06-5110-42ac-9e5e-43197f4ddf2e Ancestors: VMMaker.oscog-eem.1309 Fix constant elimination on arithmetic generation so that named constants (defines) are not elided. =============== Diff against VMMaker.oscog-eem.1309 =============== Item was added: + ----- Method: TDefineNode>>constantNumbericValueOrNil (in category 'testing') ----- + constantNumbericValueOrNil + "Override so that named constants don't get elided." + ^nil!

1 0

[commit][3347] Update plugin version stamp since platforms/win32/ plugins has changed.
by commits＠squeakvm.org 17 May '15

17 May '15

Revision: 3347 Author: eliot Date: 2015-05-17 13:13:47 -0700 (Sun, 17 May 2015) Log Message: ----------- Update plugin version stamp since platforms/win32/plugins has changed. Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Mar 16 20:24:07 PDT 2015 + Sun May 17 13:13:27 PDT 2015

1 0

[commit][3346] (For Marcel Taeumel) Move the long filename support alloc macros into a header
by commits＠squeakvm.org 17 May '15

17 May '15

Revision: 3346 Author: eliot Date: 2015-05-17 13:13:11 -0700 (Sun, 17 May 2015) Log Message: ----------- (For Marcel Taeumel) Move the long filename support alloc macros into a header so they can be used in sqWin32FileDirectory.c as well. Modified Paths: -------------- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c Added Paths: ----------- trunk/platforms/win32/plugins/FilePlugin/sqWin32File.h Added: trunk/platforms/win32/plugins/FilePlugin/sqWin32File.h =================================================================== --- trunk/platforms/win32/plugins/FilePlugin/sqWin32File.h (rev 0) +++ trunk/platforms/win32/plugins/FilePlugin/sqWin32File.h 2015-05-17 20:13:11 UTC (rev 3346) @@ -0,0 +1,58 @@ +#ifndef __SQ_WIN32_FILE_H +#define __SQ_WIN32_FILE_H + +/** + Converts multi-byte characters to wide characters. Handles paths longer + than 260 characters (including NULL) by prepending "\\?\" to encode UNC + paths as suggested in http://msdn.microsoft.com/en-us/library/windows/ + desktop/aa365247%28v=vs.85%29.aspx#maxpath + "The maximum path of 32,767 characters is approximate, + because the "\\?\" prefix may be expanded to a longer + string by the system at run time, and this expansion + applies to the total length." + + Note that we do not check for the correct path component size, + which should be MAX_PATH in general but can vary between file systems. + Actually, we should perform an additional check with + GetVolumneInformation to acquire lpMaximumComponentLength. + + Note that another possibility would be to use 8.3 aliases + for path components like the Windows Explorer does. However, + this feature also depends on the volume specifications. + + Calling alloca() should be fine because we limit path length to 32k. + Stack size limit is much higher. + + When using an API to create a directory, the specified path cannot be + so long that you cannot append an 8.3 file name (that is, the directory + name cannot exceed MAX_PATH minus 12). +**/ +#define ALLOC_WIN32_PATH(out_path, in_name, in_size) { \ + int sz = MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, NULL, 0); \ + if(sz >= 32767) FAIL(); \ + if(sz >= MAX_PATH-12 /* for directory creation; see above */) { \ + out_path = (WCHAR*)alloca((sz + 4 + 1) * sizeof(WCHAR)); \ + out_path[0] = L'\\'; out_path[1] = L'\\'; \ + out_path[2] = L'?'; out_path[3] = L'\\'; \ + MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, out_path + 4, sz); \ + out_path[sz + 4] = 0; \ + sz += 4; \ + } else { \ + out_path = (WCHAR*)alloca((sz + 1) * sizeof(WCHAR)); \ + MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, out_path, sz); \ + out_path[sz] = 0; \ + } \ +} + +// if(wcscpy_s(in_out_wide_path, in_size < sz ? in_size : sz, tmp) != 0) FAIL(); \ + +#define REALLOC_WIN32_PATH(in_out_wide_path, in_size) { \ + int sz = wcslen(in_out_wide_path); \ + WCHAR *tmp = in_out_wide_path; \ + in_out_wide_path = (WCHAR*)alloca((in_size+1) * sizeof(WCHAR)); \ + if(in_size < sz) tmp[in_size] = 0; \ + wcscpy(in_out_wide_path, tmp); \ + in_out_wide_path[in_size] = 0; \ +} + +#endif \ No newline at end of file Modified: trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c =================================================================== --- trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2015-05-15 20:18:50 UTC (rev 3345) +++ trunk/platforms/win32/plugins/FilePlugin/sqWin32FilePrims.c 2015-05-17 20:13:11 UTC (rev 3346) @@ -24,6 +24,8 @@ #include "sq.h" #include "FilePlugin.h" +#include "sqWin32File.h" + extern struct VirtualMachine *interpreterProxy; #ifdef WIN32_FILE_SUPPORT @@ -68,46 +70,6 @@ /* answers if the file name in question has a case-sensitive duplicate */ int hasCaseSensitiveDuplicate(WCHAR *path); -/** - Converts multi-byte characters to wide characters. Handles paths longer - than 260 characters (including NULL) by prepending "\\?\" to encode UNC - paths as suggested in http://msdn.microsoft.com/en-us/library/windows/ - desktop/aa365247%28v=vs.85%29.aspx#maxpath - "The maximum path of 32,767 characters is approximate, - because the "\\?\" prefix may be expanded to a longer - string by the system at run time, and this expansion - applies to the total length." - - Note that we do not check for the correct path component size, - which should be MAX_PATH in general but can vary between file systems. - Actually, we should perform an additional check with - GetVolumneInformation to acquire lpMaximumComponentLength. - - Note that another possibility would be to use 8.3 aliases - for path components like the Windows Explorer does. However, - this feature also depends on the volume specifications. - - Calling alloca() should be fine because we limit path length to 32k. - Stack size limit is much higher. -**/ -#define ALLOC_WIN32_PATH(out_path, in_name, in_size) { \ - int sz = MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, NULL, 0); \ - if(sz >= 32767) FAIL(); \ - if(sz >= MAX_PATH) { \ - out_path = (WCHAR*)alloca((sz + 4 + 1) * sizeof(WCHAR)); \ - out_path[0] = L'\\'; out_path[1] = L'\\'; \ - out_path[2] = L'?'; out_path[3] = L'\\'; \ - MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, out_path + 4, sz); \ - out_path[sz + 4] = 0; \ - sz += 4; \ - } else { \ - out_path = (WCHAR*)alloca((sz + 1) * sizeof(WCHAR)); \ - MultiByteToWideChar(CP_UTF8, 0, in_name, in_size, out_path, sz); \ - out_path[sz] = 0; \ - } \ -} - - typedef union { struct { DWORD dwLow;

1 0

VM Maker: VMMaker.oscog-eem.1309.mcz
by commits＠source.squeak.org 17 May '15

17 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1309.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1309 Author: eem Time: 17 May 2015, 12:49:48.29 pm UUID: e84bfebb-45e5-4768-8af7-865503cec26a Ancestors: VMMaker.oscog-rmacnak.1308 Fix ceActivateFailingPrimitiveMethod: to return properly after retrying a primitive after checkForAndFollowForwardedPrimitiveState. e.g. fixes | s | 1 to: 5 do: [:i| s := 'bar'. s becomeForward: 'bzzt' copy. 'foo' <= s] Fix bug in followForwardedFrameContents:stackPointer: so that arguments are actually followed. N.B. drives the above bug underground ;-). Make the bounds check in primitiveObject:perform:... more restrictive and fix bugs in the commentary. Make stack pages a reasonable size. My math was wrong and the size was half as big as intended. Simulator: Refactor accessor depth determination of accessors so that simulator derives correct values for translated primitives. And fix translatedPrimitiveArgument:ofType:using: so that translated primitives will fail in the simulator. =============== Diff against VMMaker.oscog-rmacnak.1308 =============== Item was changed: ----- Method: CCodeGenerator>>accessorsAndAssignmentsForMethod:actuals:depth:interpreterClass:into: (in category 'spur primitive compilation') ----- accessorsAndAssignmentsForMethod: method actuals: actualParameters depth: depth interpreterClass: interpreterClass into: aTrinaryBlock "Evaluate aTrinaryBlock with the root accessor sends, accessor sends and assignments in the method." | accessors assignments roots | accessors := Set new. assignments := Set new. roots := Set new. actualParameters with: method args do: [:actual :argName| (actual isVariable or: [actual isSend]) ifTrue: + [(actual isSend and: [self isStackAccessor: actual selector given: interpreterClass]) ifTrue: + [roots add: actual]. + assignments add: (TAssignmentNode new - [assignments add: (TAssignmentNode new setVariable: (TVariableNode new setName: argName) expression: actual)]]. method parseTree nodesDo: [:node| node isSend ifTrue: + [(self isStackAccessor: node selector given: interpreterClass) ifTrue: - [(interpreterClass isStackAccessor: node selector) ifTrue: [roots add: node]. + (self isObjectAccessor: node selector given: interpreterClass) ifTrue: - (interpreterClass isObjectAccessor: node selector) ifTrue: [accessors add: node]. (self accessorDepthDeterminationFollowsSelfSends and: [node receiver isVariable and: [node receiver name = 'self' and: [roots isEmpty or: [node args anySatisfy: [:arg| (roots includes: arg) or: [(accessors includes: arg) or: [assignments anySatisfy: [:assignment| assignment variable isSameAs: arg]]]]]]]]) ifTrue: [self accessorsAndAssignmentsForSubMethodNamed: node selector actuals: node args depth: depth + 1 interpreterClass: interpreterClass into: [:subRoots :subAccessors :subAssignments| (subRoots isEmpty and: [subAccessors isEmpty and: [subAssignments isEmpty]]) ifFalse: [roots addAll: subRoots. accessors add: node. accessors addAll: subAccessors. assignments addAll: subAssignments]]]]. (node isAssignment and: [(roots includes: node expression) or: [(accessors includes: node expression) or: [node expression isVariable and: [node expression name ~= 'nil']]]]) ifTrue: [assignments add: node]]. ^aTrinaryBlock value: roots value: accessors value: assignments! Item was added: + ----- Method: CCodeGenerator>>isObjectAccessor:given: (in category 'spur primitive compilation') ----- + isObjectAccessor: selector given: interpreterClass + ^interpreterClass isObjectAccessor: selector! Item was added: + ----- Method: CCodeGenerator>>isStackAccessor:given: (in category 'spur primitive compilation') ----- + isStackAccessor: selector given: interpreterClass + ^interpreterClass isStackAccessor: selector! Item was changed: ----- Method: CoInterpreter>>ceActivateFailingPrimitiveMethod: (in category 'enilopmarts') ----- ceActivateFailingPrimitiveMethod: aPrimitiveMethod "An external call or FFI primitive has failed. Build the frame and activate as appropriate. Enter either the interpreter or machine code depending on whether aPrimitiveMethod has been or is still cogged. Note that we could always interpret but want the efficiency of executing machine code if it is available." <api> + | methodHeader result | - | methodHeader | self assert: primFailCode ~= 0. self assert: newMethod = aPrimitiveMethod. "If we're on Spur, check for forwarders and retry, returning if successful the second time around." (objectMemory hasSpurMemoryManagerAPI and: [self checkForAndFollowForwardedPrimitiveState]) ifTrue: [self initPrimCall. self cCode: [self dispatchFunctionPointer: primitiveFunctionPointer] inSmalltalk: [| evaluable | evaluable := primitiveFunctionPointer isInteger ifTrue: [cogit simulatedTrampolines at: primitiveFunctionPointer] ifFalse: [primitiveFunctionPointer]. evaluable isMessageSend ifTrue: [self assert: evaluable receiver == self] ifFalse: [self assert: evaluable isBlock]. evaluable value]. self successful ifTrue: + [result := self stackTop. + self stackTopPut: instructionPointer. + self push: result. + cogit ceEnterCogCodePopReceiverReg]]. - [^self]]. methodHeader := self rawHeaderOf: aPrimitiveMethod. (self isCogMethodReference: methodHeader) ifTrue: [self activateCoggedNewMethod: false] ifFalse: [self activateNewMethod]! Item was changed: ----- Method: CogVMSimulator>>utilitiesMenu: (in category 'UI') ----- utilitiesMenu: aMenuMorph aMenuMorph add: 'toggle transcript' action: #toggleTranscript; add: 'clone VM' action: #cloneSimulationWindow; addLine; add: 'print ext head frame' action: #printExternalHeadFrame; add: 'print int head frame' action: #printHeadFrame; add: 'print mc/cog frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp]; add: 'short print ext frame & callers' action: [self shortPrintFrameAndCallers: framePointer]; add: 'short print int frame & callers' action: [self shortPrintFrameAndCallers: localFP]; add: 'short print mc/cog frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp]; add: 'long print ext frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer]; add: 'long print int frame & callers' action: [self printFrameAndCallers: localFP SP: localSP]; add: 'long print mc/cog frame & callers' action: [self printFrameAndCallers: cogit processor fp SP: cogit processor sp]; add: 'print frame...' action: [(self promptHex: 'print frame') ifNotNil: [:fp| self printFrame: fp]]; add: 'print call stack' action: #printCallStack; add: 'print stack call stack' action: #printStackCallStack; add: 'print stack call stack of...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printStackCallStackOf: fp]]; add: 'print call stack of...' action: [(self promptHex: 'context or process oop') ifNotNil: [:obj| self printCallStackOf: obj]]; add: 'print call stack of frame...' action: [(self promptHex: 'frame') ifNotNil: [:fp| self printCallStackFP: fp]]; add: 'print all stacks' action: #printAllStacks; add: 'write back local ptrs' action: [stackPointer := localSP. framePointer := localFP. instructionPointer := localIP. self writeBackHeadFramePointers]; add: 'write back mc ptrs' action: [stackPointer := cogit processor sp. framePointer := cogit processor fp. instructionPointer := cogit processor eip. self writeBackHeadFramePointers]; addLine; add: 'print rump C stack' action: [objectMemory printMemoryFrom: cogit processor sp to: self CStackPointer]; add: 'print registers' action: [cogit processor printRegistersOn: transcript]; add: 'print register map' action: [cogit printRegisterMapOn: transcript]; add: 'disassemble method/trampoline...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit disassembleCodeAt: pc]]; + add: 'disassemble method/trampoline at pc' action: + [cogit disassembleCodeAt: ((cogit methodZone methodFor: cogit processor pc) = 0 + ifTrue: [instructionPointer] + ifFalse: [cogit processor pc])]; - add: 'disassemble method/trampoline at pc' action: [cogit disassembleCodeAt: cogit processor pc]; add: 'disassemble ext head frame method' action: [cogit disassembleMethod: (self frameMethod: framePointer)]; add: 'print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self printOop: oop]]; add: 'long print oop...' action: [(self promptHex: 'print oop') ifNotNil: [:oop| self longPrintOop: oop]]; add: 'print context...' action: [(self promptHex: 'print context') ifNotNil: [:oop| self printContext: oop]]; addLine; add: 'inspect object memory' target: objectMemory action: #inspect; add: 'inspect cointerpreter' action: #inspect; add: 'inspect cogit' target: cogit action: #inspect; add: 'inspect method zone' target: cogit methodZone action: #inspect. self isThreadedVM ifTrue: [aMenuMorph add: 'inspect thread manager' target: self threadManager action: #inspect]. aMenuMorph addLine; add: 'print cog methods' target: cogMethodZone action: #printCogMethods; add: 'print cog methods with prim...' action: [(self promptNum: 'prim index') ifNotNil: [:pix| cogMethodZone printCogMethodsWithPrimitive: pix]]; add: 'print cog methods with selector...' action: [|s| s := UIManager default request: 'selector'. s notEmpty ifTrue: [s = 'nil' ifTrue: [s := nil]. cogMethodZone methodsDo: [:m| (s ifNil: [m selector = objectMemory nilObject] ifNotNil: [(objectMemory numBytesOf: m selector) = s size and: [(self str: s n: (m selector + objectMemory baseHeaderSize) cmp: (objectMemory numBytesOf: m selector)) = 0]]) ifTrue: [cogit printCogMethod: m]]]]; add: 'print cog method for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodFor: pc]]; add: 'print cog method header for...' action: [(self promptHex: 'pc') ifNotNil: [:pc| cogit printCogMethodHeaderFor: pc]]; add: 'print trampoline table' target: cogit action: #printTrampolineTable; add: 'print prim trace log' action: #dumpPrimTraceLog; add: 'report recent instructions' target: cogit action: #reportLastNInstructions; add: 'set break pc (', (cogit breakPC isInteger ifTrue: [cogit breakPC hex] ifFalse: [cogit breakPC printString]), ')...' action: [(self promptHex: 'break pc') ifNotNil: [:bpc| cogit breakPC: bpc]]; add: (cogit singleStep ifTrue: ['no single step'] ifFalse: ['single step']) action: [cogit singleStep: cogit singleStep not]; add: (cogit printRegisters ifTrue: ['no print registers each instruction'] ifFalse: ['print registers each instruction']) action: [cogit printRegisters: cogit printRegisters not]; add: (cogit printInstructions ifTrue: ['no print instructions each instruction'] ifFalse: ['print instructions each instruction']) action: [cogit printInstructions: cogit printInstructions not]; addLine; add: 'click step' action: [cogit setClickStepBreakBlock]; add: 'set break count...' action: [|s| s := UIManager default request: 'break count (dec)'. s notEmpty ifTrue: [breakCount := Integer readFrom: s readStream]]; add: 'set break selector...' action: [|s| s := UIManager default request: 'break selector'. s notEmpty ifTrue: [self setBreakSelector: s]]; add: 'set break block...' action: [|s| s := UIManager default request: 'break block' initialAnswer: '[:theCogit| false]'. s notEmpty ifTrue: [self setBreakBlockFromString: s]]; add: 'set cogit break method...' action: [(self promptHex: 'cogit breakMethod') ifNotNil: [:bm| cogit setBreakMethod: bm]]; add: (printBytecodeAtEachStep ifTrue: ['no print bytecode each bytecode'] ifFalse: ['print bytecode each bytecode']) action: [self ensureDebugAtEachStepBlock. printBytecodeAtEachStep := printBytecodeAtEachStep not]; add: (printFrameAtEachStep ifTrue: ['no print frame each bytecode'] ifFalse: ['print frame each bytecode']) action: [self ensureDebugAtEachStepBlock. printFrameAtEachStep := printFrameAtEachStep not]. ^aMenuMorph! Item was changed: ----- Method: Cogit>>recordLastInstruction (in category 'simulation only') ----- recordLastInstruction <doNotGenerate> + | inst pc | + (EagerInstructionDecoration or: [printInstructions]) + ifTrue: + [inst := processor + disassembleNextInstructionIn: coInterpreter memory + for: self. + printInstructions ifTrue: + [pc := Integer readFrom: (ReadStream on: inst from: 1 to: (inst indexOf: $:) - 1) base: 16. + (self relativeLabelForPC: pc) ifNotNil: + [:label| inst := inst, ' ', label]]] + ifFalse: + [inst := processor + disassembleNextInstructionIn: coInterpreter memory + for: nil]. + ^self recordInstruction: inst! - ^self recordInstruction: (processor - disassembleNextInstructionIn: coInterpreter memory - for: ((EagerInstructionDecoration or: [printInstructions]) ifTrue: [self]))! Item was changed: ----- Method: InterpreterPlugin>>translatedPrimitiveArgument:ofType:using: (in category 'simulation') ----- translatedPrimitiveArgument: index ofType: cTypeString using: aCCodeGenerator | oop | oop := interpreterProxy stackValue: interpreterProxy methodArgumentCount - index. + (interpreterProxy isOopForwarded: oop) ifTrue: [^nil]. cTypeString last == $* ifTrue: [^ObjectProxyForTranslatedPrimitiveSimulation new interpreter: interpreterProxy oop: oop unitSize: (self sizeof: (aCCodeGenerator baseTypeForPointerType: cTypeString) asSymbol)]. ((interpreterProxy isIntegerObject: oop) and: [aCCodeGenerator isIntegralCType: cTypeString]) ifTrue: [^interpreterProxy integerValueOf: oop]. self halt! Item was changed: ----- Method: StackInterpreter>>followForwardedFrameContents:stackPointer: (in category 'lazy become') ----- followForwardedFrameContents: theFP stackPointer: theSP "follow pointers in the current stack frame up to theSP." <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <inline: false> <var: #ptr type: #'char *'> + theSP + to: (self frameReceiverLocation: theFP) - theFP + (self frameStackedReceiverOffset: theFP) - to: theFP + FoxCallerSavedIP + objectMemory wordSize by: objectMemory wordSize do: [:ptr| | oop | oop := stackPages longAt: ptr. ((objectMemory isNonImmediate: oop) and: [objectMemory isForwarded: oop]) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. + theFP + FoxCallerSavedIP + objectMemory wordSize + to: theFP + (self frameStackedReceiverOffset: theFP) - theSP - to: (self frameReceiverLocation: theFP) by: objectMemory wordSize do: [:ptr| | oop | oop := stackPages longAt: ptr. ((objectMemory isNonImmediate: oop) and: [objectMemory isForwarded: oop]) ifTrue: [stackPages longAt: ptr put: (objectMemory followForwarded: oop)]]. self assert: (objectMemory isForwarded: (self frameMethodObject: theFP)) not. (self frameHasContext: theFP) ifTrue: [self assert: (objectMemory isForwarded: (self frameContext: theFP)) not]! Item was changed: ----- Method: StackInterpreter>>primitiveObject:perform:withArguments:lookedUpIn: (in category 'control primitives') ----- primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClassOrNil "Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:, object:perform:withArgs:inClass: et al. Answer nil on success. NOTE: The case of doesNotUnderstand: is not a failure to perform. The only failures are arg types and consistency of argumentCount. Since we're in the stack VM we can assume there is space to push the arguments provided they are within limits (max argument count is 15). We can therefore deal with the arbitrary amount of state to remove from the stack (lookup class, selector, mirror receiver) and arbitrary argument orders by deferring popping anything until we know whether the send has succeeded. So on failure we merely have to remove the actual receiver and arguments pushed, and on success we have to slide the actual receiver and arguments down to replace the original ones." <inline: true> | arraySize performArgCount delta | (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. "Check if number of arguments is reasonable; MaxNumArgs isn't available so just use LargeContextSize" arraySize := objectMemory numSlotsOf: argumentArray. + arraySize > (LargeContextSlots - CtxtTempFrameStart) ifTrue: - arraySize > LargeContextSlots ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. performArgCount := argumentCount. "Push newMethod to save it in case of failure, + then push the actual receiver and the args in the array." - then push the actual receiver and args out of the array." self push: newMethod. self push: actualReceiver. + "Copy the arguments to the stack, in case of MNU, and lookup" - "Copy the arguments to the stack, and execute" 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. argumentCount := arraySize. messageSelector := selector. self sendBreakpoint: messageSelector receiver: actualReceiver. self printSends ifTrue: [self printActivationNameForSelector: messageSelector startClass: (lookupClassOrNil isNil ifTrue: [objectMemory fetchClassOf: actualReceiver] ifFalse: [lookupClassOrNil]); cr]. self findNewMethodInClassTag: (lookupClassOrNil isNil ifTrue: [objectMemory fetchClassTagOf: actualReceiver] ifFalse: [objectMemory classTagForClass: lookupClassOrNil]). "Only test CompiledMethods for argument count - any other objects playacting as CMs will have to take their chances" ((objectMemory isOopCompiledMethod: newMethod) and: [(self argumentCountOf: newMethod) ~= argumentCount]) ifTrue: + ["Restore the state by popping the array entries, the actual receiver and the saved + newMethod, leaving the selector and array, and fail. N.B. If an MNU has happened + then argumentCount will match newMethod, so this code will not be reached." + "These asserts check that an MNU has not occurred if the argumentCount doesn't match the newMethod." + self assert: (self stackTop = (arraySize = 0 + ifTrue: [actualReceiver] + ifFalse: [(objectMemory fetchPointer: arraySize - 1 ofObject: argumentArray)])). + self assert: argumentCount = arraySize. - ["Restore the state by popping all those array entries and pushing back the selector and array, and fail" self pop: arraySize + 1. newMethod := self popStack. ^self primitiveFailFor: PrimErrBadNumArgs]. "Cannot fail this primitive from here-on. Slide the actual receiver and arguments down to replace the perform arguments and saved newMethod and then execute the new method. Use argumentCount not arraySize because an MNU may have changed it." delta := objectMemory wordSize * (performArgCount + 2). "+2 = receiver + saved newMethod" argumentCount * objectMemory wordSize to: 0 by: objectMemory wordSize negated do: [:offset| stackPages longAt: stackPointer + offset + delta put: (stackPages longAt: stackPointer + offset)]. self pop: performArgCount + 2. self executeNewMethod. self initPrimCall. "Recursive xeq affects primErrorCode" ^nil! Item was changed: ----- Method: StackInterpreter>>stackPageByteSize (in category 'stack pages') ----- stackPageByteSize "Answer a page size that is a power-of-two and contains a useful number of frames. + Room for 256 slots for frames gives around 40 frames a page which is a - Room for 512 bytes of frames gives around 40 frames a page which is a good compromise between overflow rate and latency in divorcing a page." <inline: false> | pageBytes largeSize smallSize | pageBytes := self stackPageFrameBytes + self stackLimitOffset + self stackPageHeadroom. (pageBytes bitAnd: pageBytes - 1) = 0 ifTrue: "= 0 => a power of two" [^pageBytes]. "round up or round down; that is the question. If rounding down reduces the size by no more than 1/8th round down, otherwise roundup." largeSize := 1 << pageBytes highBit. smallSize := 1 << (pageBytes highBit - 1). self assert: (largeSize > pageBytes and: [pageBytes > smallSize]). ^(pageBytes - smallSize) <= (smallSize / 8) ifTrue: [smallSize] ifFalse: [largeSize]! Item was changed: ----- Method: StackInterpreter>>stackPageFrameBytes (in category 'stack pages') ----- stackPageFrameBytes + "Answer a byte size that accomodates a useful number of frames. The minimum frame size is + 7 slots in the StackInterpreter, and 6 slots in the CoInterpreter, and the maximum size is 56 + 7 + slots in the StackInterpreter and 56 + 8 slots in the CoInterpreter. 256 slots gives from 4 to 36 + frames in the StackInterpreter and from 4 to 42 in the CoInterpreter. Hence 2048 bytes in 32-bits + and 4096 bytes in 64-bits; a compromise between overflow rate and latency in divorcing a page." + "Defining as a macro simplifies hand editing the C for experiments..." + <cmacro: '() (256 * BytesPerWord)'> + ^256 * objectMemory wordSize! - "Answer a byte size that accomodates a useful number of frames. - 512 bytes is room for around 40 frames a page which is a good - compromise between overflow rate and latency in divorcing a page." - ^objectMemory bytesPerOop = 8 - ifTrue: [1024] - ifFalse: [512]! Item was added: + ----- Method: VMPluginCodeGenerator>>isObjectAccessor:given: (in category 'spur primitive compilation') ----- + isObjectAccessor: selector given: interpreterClass + "Override to include the selectors transformed into accessors for translated primitives. + InterpreterPlugin browseTranslatedPrimitives" + ^(#(asciiValue at: at:put: basicAt: size) includes: selector) + or: [super isObjectAccessor: selector given: interpreterClass]!

1 0

[win32] Long path name support for directory creation/lookup
by marcel.taeumel 17 May '15

17 May '15

Hi, there! I just discovered that the "sqWin32Directory.c" is not located in in the plugins (FilePlugin) but the vm folder. And hence I missed to add support for UNC paths there, too. That's why unzipping big things from GitHub (e.g. metacello-work) does not work. Directories have to be created first. Only then files are created. I plan to fix this. Hopefully until Monday. Best, Marcel -- View this message in context: http://forum.world.st/win32-Long-path-name-support-for-directory-creation-l… Sent from the Squeak VM mailing list archive at Nabble.com.

1 3

VM Maker: VMMaker.oscog-rmacnak.1308.mcz
by commits＠source.squeak.org 17 May '15

17 May '15

Ryan Macnak uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-rmacnak.1308.mcz ==================== Summary ==================== Name: VMMaker.oscog-rmacnak.1308 Author: rmacnak Time: 16 May 2015, 5:12:07.514 pm UUID: 0ea6a317-5be4-48a2-b82e-ba8fea3f5fc4 Ancestors: VMMaker.oscog-eem.1307 Remove landmine left from restructing implicit receiver and outer sends as clean sends. =============== Diff against VMMaker.oscog-eem.1307 =============== Item was changed: ----- Method: CoInterpreter>>ceImplicitReceiverSend:receiver: (in category 'trampolines') ----- ceImplicitReceiverSend: cacheAddress receiver: methodReceiver "An implicit receiver send cache missed." | nsSendCache methodMixin numArgs selector implicitReceiver cogMethod irClassTag mrClassTag errSelIdx | <api> <option: #NewspeakVM> <inline: false> <var: #nsSendCache type: #'NSSendCache *'> <var: #cogMethod type: #'CogMethod *'> cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: methodReceiver). nsSendCache := self cCoerceSimple: cacheAddress to: #'NSSendCache *'. selector := nsSendCache selector. numArgs := nsSendCache numArgs. methodMixin := self mMethodClass. implicitReceiver := self implicitReceiverFor: methodReceiver mixin: methodMixin implementing: selector. self assert: (self stackValue: numArgs + 1 "ret val") = methodReceiver. self stackValue: numArgs + 1 "ret val " put: implicitReceiver. "Replace the methodReceiver on the stack with the implicitReceiver. When the cache has a hit, we don't care that the value on the stack is wrong because the compiled callee will use the value in ReceiverResultReg to build its frame. But the interpreter will use stack(numArgs)." mrClassTag := objectMemory fetchClassTagOf: methodReceiver. irClassTag := objectMemory fetchClassTagOf: implicitReceiver. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: irClassTag) ifTrue: ["check for coggability because method is in the cache" self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [ (objectMemory isOopForwarded: selector) ifTrue: [self error: 'Selector should have fixed by mapObjectReferencesInMachineCodeForBecome']. (objectMemory isForwardedClassTag: irClassTag) ifTrue: [self error: 'Implicit receiver lookup should have followed fowarded objects']. messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: irClassTag)) ~= 0 ifTrue: [[self handleMNU: errSelIdx InMachineCodeTo: implicitReceiver classForMessage: (objectMemory classForClassTag: irClassTag). self error: 'UNREACHABLE3']]]. (self maybeMethodHasCogMethod: newMethod) ifTrue: [ cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [ (cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod | cogMethod := newCogMethod]]]. cogMethod selector = selector ifTrue: [cogit linkNSSendCache: nsSendCache classTag: mrClassTag enclosingObject: (implicitReceiver = methodReceiver ifTrue: [0] ifFalse: [implicitReceiver]) target: cogMethod caller: self mframeHomeMethodExport] + ifFalse: ["Out of code memory. Fall through to interpret."]. - ifFalse: [self error: 'What does this mean? C.f. case in ceSend:...']. instructionPointer := self popStack. self executeNewMethod. self error: 'UNREACHABLE 1']. instructionPointer := self popStack. self interpretMethodFromMachineCode. self error: 'UNREACHABLE 2'. ^nil! Item was changed: ----- Method: CoInterpreter>>ceOuterSend:receiver: (in category 'trampolines') ----- ceOuterSend: cacheAddress receiver: methodReceiver "An outer send cache missed." | nsSendCache methodMixin numArgs selector depth enclosingObject cogMethod eoClassTag mrClassTag errSelIdx | <api> <option: #NewspeakVM> <inline: false> <var: #nsSendCache type: #'NSSendCache *'> <var: #cogMethod type: #'CogMethod *'> cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: methodReceiver). nsSendCache := self cCoerceSimple: cacheAddress to: #'NSSendCache *'. selector := nsSendCache selector. numArgs := nsSendCache numArgs. depth := nsSendCache depth. methodMixin := self mMethodClass. enclosingObject := self enclosingObjectAt: depth withObject: methodReceiver withMixin: methodMixin. self assert: (self stackValue: numArgs + 1 "ret val") = methodReceiver. self stackValue: numArgs + 1 "ret val " put: enclosingObject. "Replace the methodReceiver on the stack with the enclosingObject. When the cache has a hit, we don't care that the value on the stack is wrong because the compiled callee will use the value in ReceiverResultReg to build its frame. But the interpreter will use stack(numArgs)." mrClassTag := objectMemory fetchClassTagOf: methodReceiver. eoClassTag := objectMemory fetchClassTagOf: enclosingObject. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: eoClassTag) ifTrue: ["check for coggability because method is in the cache" self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [ (objectMemory isOopForwarded: selector) ifTrue: [self error: 'Selector should have fixed by mapObjectReferencesInMachineCodeForBecome']. (objectMemory isForwardedClassTag: eoClassTag) ifTrue: [self error: 'Implicit receiver lookup should have followed fowarded objects']. messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: eoClassTag)) ~= 0 ifTrue: [[self handleMNU: errSelIdx InMachineCodeTo: enclosingObject classForMessage: (objectMemory classForClassTag: eoClassTag). self error: 'UNREACHABLE3']]]. (self maybeMethodHasCogMethod: newMethod) ifTrue: [ cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [ (cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod | cogMethod := newCogMethod]]]. cogMethod selector = selector ifTrue: [cogit linkNSSendCache: nsSendCache classTag: mrClassTag enclosingObject: enclosingObject target: cogMethod caller: self mframeHomeMethodExport] + ifFalse: ["Out of code memory. Fall through to interpret."]. - ifFalse: [self error: 'What does this mean? C.f. case in ceSend:...']. instructionPointer := self popStack. self executeNewMethod. self error: 'UNREACHABLE 1']. instructionPointer := self popStack. self interpretMethodFromMachineCode. self error: 'UNREACHABLE 2'. ^nil!

1 0

Trying to understand tenuring
by Norbert Hartl 17 May '15

17 May '15

I'm inspecting memory behaviour at the moment. I have an image that receives roughly 1 request/s a zinc request. The request is processed without a notable amount of objects created on its way. Every 5 seconds it opens a zinc client connection to another host. That's basically all what happens. Looking at the memory consumption I get What puzzles me is the growth of old space. The requests take a few milliseconds. The maximum time the objects are in image are the few milliseconds of processing time and the 5 seconds of buffering. Looking at the garbage collections I get So doing the math gives me: We have a 160 milli garbage collections per second which is roughly a garbage collection every 6 seconds. A tenure is roughly every 10 GCs. So I would assume that an object needs to stay connected 60 seconds until it gets tenured. But all of the objects in the request don't live that long. How can I interpret the graph above where the old space is growing until a full GC? Is there an easy explanation for this? thanks, Norbert

5 5

VM Maker: VMMaker.oscog-eem.1307.mcz
by commits＠source.squeak.org 16 May '15

16 May '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1307.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1307 Author: eem Time: 15 May 2015, 5:58:56.595 pm UUID: 4406a119-cdb6-40b3-a2ec-c1989e044870 Ancestors: VMMaker.oscog-eem.1306 Revamp icache flushing in the Cogit for ARM. Move icache flush for generated methods/pics to the fillIn*Header: routines. Make sure the cache is flushed in generateCaptureCStackPointers:. Flush the entire PIC when extending it (dubious). Extend the fastPrimTrace scheme to trace stack overflow, prim failure and prim retry to help debug the phantom stack frame bug in Cog Spur. =============== Diff against VMMaker.oscog-eem.1306 =============== Item was changed: StackInterpreterPrimitives subclass: #CoInterpreter instanceVariableNames: 'cogit cogMethodZone gcMode cogCodeSize desiredCogCodeSize heapBase lastCoggableInterpretedBlockMethod reenterInterpreter deferSmash deferredSmash primTraceLog primTraceLogIndex traceLog traceLogIndex traceSources cogCompiledCodeCompactionCalledFor statCodeCompactionCount statCodeCompactionUsecs lastUncoggableInterpretedBlockMethod processHasThreadId flagInterpretedMethods maxLiteralCountForCompile minBackwardJumpCountForCompile noThreadingOfGUIThread' + classVariableNames: 'CSCallbackEnter CSCallbackLeave CSCheckEvents CSEnterCriticalSection CSExitCriticalSection CSOwnVM CSResume CSSignal CSSuspend CSSwitchIfNeccessary CSThreadBind CSThreadSchedulingLoop CSWait CSYield HasBeenReturnedFromMCPC MFMethodFlagFrameIsMarkedFlag MinBackwardJumpCountForCompile PrimTraceLogSize ReturnToInterpreter RumpCStackSize TraceBlockActivation TraceBlockCreation TraceBufferSize TraceCodeCompaction TraceContextSwitch TraceDisownVM TraceFullGC TraceIncrementalGC TraceIsFromInterpreter TraceIsFromMachineCode TraceOwnVM TracePreemptDisowningThread TracePrimitiveFailure TracePrimitiveRetry TraceSources TraceStackOverflow TraceThreadSwitch TraceVMCallback TraceVMCallbackReturn' - classVariableNames: 'CSCallbackEnter CSCallbackLeave CSCheckEvents CSEnterCriticalSection CSExitCriticalSection CSOwnVM CSResume CSSignal CSSuspend CSSwitchIfNeccessary CSThreadBind CSThreadSchedulingLoop CSWait CSYield HasBeenReturnedFromMCPC MFMethodFlagFrameIsMarkedFlag MinBackwardJumpCountForCompile PrimTraceLogSize ReturnToInterpreter RumpCStackSize TraceBlockActivation TraceBlockCreation TraceBufferSize TraceCodeCompaction TraceContextSwitch TraceDisownVM TraceFullGC TraceIncrementalGC TraceIsFromInterpreter TraceIsFromMachineCode TraceOwnVM TracePreemptDisowningThread TraceSources TraceStackOverflow TraceThreadSwitch TraceVMCallback TraceVMCallbackReturn' poolDictionaries: 'CogMethodConstants VMStackFrameOffsets' category: 'VMMaker-JIT'! !CoInterpreter commentStamp: '<historical>' prior: 0! I am a variant of the StackInterpreter that can co-exist with the Cog JIT. I interpret unjitted methods, either because they have been found for the first time or because they are judged to be too big to JIT. See CogMethod class's comment for method interoperability.! Item was changed: ----- Method: CoInterpreter class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants super initializeMiscConstants. COGVM := true. MinBackwardJumpCountForCompile := 40. MaxNumArgs := 15. PrimCallNeedsNewMethod := 1. PrimCallNeedsPrimitiveFunction := 2. PrimCallMayCallBack := 4. PrimCallCollectsProfileSamples := 8. CheckAllocationFillerAfterPrimCall := 16. PrimCallDoNotJIT := 32. ReturnToInterpreter := 1. "setjmp/longjmp code." PrimTraceLogSize := 256. "Room for 256 selectors. Must be 256 because we use a byte to hold the index" TraceBufferSize := 256 * 3. "Room for 256 events" TraceContextSwitch := self objectMemoryClass basicNew integerObjectOf: 1. TraceBlockActivation := self objectMemoryClass basicNew integerObjectOf: 2. TraceBlockCreation := self objectMemoryClass basicNew integerObjectOf: 3. TraceIncrementalGC := self objectMemoryClass basicNew integerObjectOf: 4. TraceFullGC := self objectMemoryClass basicNew integerObjectOf: 5. TraceCodeCompaction := self objectMemoryClass basicNew integerObjectOf: 6. TraceOwnVM := self objectMemoryClass basicNew integerObjectOf: 7. TraceDisownVM := self objectMemoryClass basicNew integerObjectOf: 8. TraceThreadSwitch := self objectMemoryClass basicNew integerObjectOf: 9. TracePreemptDisowningThread := self objectMemoryClass basicNew integerObjectOf: 10. TraceVMCallback := self objectMemoryClass basicNew integerObjectOf: 11. TraceVMCallbackReturn := self objectMemoryClass basicNew integerObjectOf: 12. TraceStackOverflow := self objectMemoryClass basicNew integerObjectOf: 13. + TracePrimitiveFailure := self objectMemoryClass basicNew integerObjectOf: 14. + TracePrimitiveRetry := self objectMemoryClass basicNew integerObjectOf: 15. TraceIsFromMachineCode := 1. TraceIsFromInterpreter := 2. CSCallbackEnter := 3. CSCallbackLeave := 4. CSEnterCriticalSection := 5. CSExitCriticalSection := 6. CSResume := 7. CSSignal := 8. CSSuspend := 9. CSWait := 10. CSYield := 11. CSCheckEvents := 12. CSThreadSchedulingLoop := 13. CSOwnVM := 14. CSThreadBind := 15. CSSwitchIfNeccessary := 16. TraceSources := CArrayAccessor on: #('?' 'm' 'i' 'callbackEnter' 'callbackLeave' 'enterCritical' 'exitCritical' 'resume' 'signal' 'suspend' 'wait' 'yield' 'eventcheck' 'threadsched' 'ownVM' 'bindToThread' 'switchIfNecessary'). "this is simulation only" RumpCStackSize := 4096! Item was added: + ----- Method: CoInterpreter>>checkForAndFollowForwardedPrimitiveState (in category 'primitive support') ----- + checkForAndFollowForwardedPrimitiveState + "Override to log" + <option: #SpurObjectMemory> + | found | + cogit recordPrimTrace ifTrue: + [self fastLogPrim: TracePrimitiveFailure]. + found := super checkForAndFollowForwardedPrimitiveState. + (found and: [cogit recordPrimTrace]) ifTrue: + [self fastLogPrim: TracePrimitiveRetry]. + ^found! Item was changed: ----- Method: CoInterpreter>>fastLogPrim: (in category 'debug support') ----- + fastLogPrim: aSelectorOrImmediate - fastLogPrim: aSelector "Fast tracing of named primitives. primTraceLogIndex is a byte variable. + aSelectorOrImmediate is a selector oop or one of TraceCodeCompaction et al. primTraceLog has 256 entries. In C the + 1 below is hence implicitly modulo 256." <inline: true> + primTraceLog at: primTraceLogIndex put: aSelectorOrImmediate. - primTraceLog at: primTraceLogIndex put: aSelector. self primTraceLogIndex: primTraceLogIndex + 1! Item was changed: ----- Method: CoInterpreter>>maybeTraceStackOverflow (in category 'debug support') ----- maybeTraceStackOverflow cogit recordOverflowTrace ifTrue: [self recordTrace: TraceStackOverflow thing: TraceStackOverflow source: ((self isMachineCodeFrame: framePointer) ifTrue: [TraceIsFromMachineCode] + ifFalse: [TraceIsFromInterpreter])]. + cogit recordPrimTrace ifTrue: + [self fastLogPrim: TraceStackOverflow]! - ifFalse: [TraceIsFromInterpreter])]! Item was changed: ----- Method: CoInterpreter>>printPrimLogEntryAt: (in category 'debug support') ----- printPrimLogEntryAt: i <inline: false> | intOrSelector | intOrSelector := primTraceLog at: i. (objectMemory isImmediate: intOrSelector) ifTrue: [intOrSelector = TraceIncrementalGC ifTrue: [self print: '**IncrementalGC**'. ^nil]. intOrSelector = TraceFullGC ifTrue: [self print: '**FullGC**'. ^nil]. intOrSelector = TraceCodeCompaction ifTrue: [self print: '**CompactCode**'. ^nil]. + intOrSelector = TraceStackOverflow ifTrue: + [self print: '**StackOverflow**'. ^nil]. + intOrSelector = TracePrimitiveFailure ifTrue: + [self print: '**PrimitiveFailure**'. ^nil]. + intOrSelector = TracePrimitiveRetry ifTrue: + [self print: '**PrimitiveRetry**'. ^nil]. self print: '???'] ifFalse: [intOrSelector = 0 ifTrue: [self printNum: i; print: '!!!!!!'] ifFalse: [objectMemory safePrintStringOf: intOrSelector]]! Item was changed: ----- Method: Cogit>>cogExtendPIC:CaseNMethod:tag:isMNUCase: (in category 'in-line cacheing') ----- cogExtendPIC: cPIC CaseNMethod: caseNMethod tag: caseNTag isMNUCase: isMNUCase "Extend the cPIC with the supplied case. If caseNMethod is cogged dispatch direct to its unchecked entry-point. If caseNMethod is not cogged, jump to the fast interpreter dispatch, and if isMNUCase then dispatch to fast MNU invocation and mark the cPIC as having the MNU case for cache flushing." <var: #cPIC type: #'CogMethod *'> | operand target address size end | "stack allocate the various collections so that they are effectively garbage collected on return." coInterpreter compilationBreak: cPIC selector point: (objectMemory numBytesOf: cPIC selector) isMNUCase: isMNUCase. self allocateOpcodes: 5 bytecodes: 0. self assert: (objectRepresentation inlineCacheTagIsYoung: caseNTag) not. "Caller patches to open pic if caseNMethod is young." self assert: (caseNMethod notNil and: [(objectMemory isYoung: caseNMethod) not]). (isMNUCase not and: [coInterpreter methodHasCogMethod: caseNMethod]) ifTrue: [operand := 0. target := (coInterpreter cogMethodOf: caseNMethod) asInteger + cmNoCheckEntryOffset] ifFalse: [isMNUCase ifTrue: [cPIC cpicHasMNUCase: true]. operand := caseNMethod. target := cPIC asInteger + (isMNUCase ifTrue: [self sizeof: CogMethod] ifFalse: [self interpretOffset - backEnd callInstructionByteSize])]. self CmpCw: caseNTag R: TempReg. self MoveCw: operand R: SendNumArgsReg. self JumpLongZero: target. self MoveCw: cPIC asInteger R: ClassReg. self JumpLong: (self cPICMissTrampolineFor: cPIC cmNumArgs). self computeMaximumSizes. address := self addressOfEndOfCase: cPIC cPICNumCases - 1 inCPIC: cPIC. size := self generateInstructionsAt: address. end := self outputInstructionsAt: address. + processor flushICacheFrom: cPIC asInteger to: cPIC asInteger + closedPICSize. - processor flushICacheFrom: address to: cPIC asInteger + closedPICSize. cPIC cPICNumCases: cPIC cPICNumCases + 1. ^0! Item was changed: ----- Method: Cogit>>fillInCPICHeader:size:numArgs:numCases:hasMNUCase:selector: (in category 'generate machine code') ----- fillInCPICHeader: pic size: size numArgs: numArgs numCases: numCases hasMNUCase: hasMNUCase selector: selector <returnTypeC: #'CogMethod *'> <var: #pic type: #'CogMethod *'> self assert: (objectMemory isYoung: selector) not. pic cmType: CMClosedPIC. pic objectHeader: 0. pic blockSize: size. pic methodObject: 0. pic methodHeader: 0. pic selector: selector. pic cmNumArgs: numArgs. pic cmRefersToYoung: false. pic cmUsageCount: self initialClosedPICUsageCount. pic cpicHasMNUCase: hasMNUCase. pic cPICNumCases: numCases. pic blockEntryOffset: 0. self assert: pic cmType = CMClosedPIC. self assert: pic selector = selector. self assert: pic cmNumArgs = numArgs. self assert: pic cPICNumCases = numCases. self assert: (backEnd callTargetFromReturnAddress: pic asInteger + missOffset) = (self picAbortTrampolineFor: numArgs). self assert: size = (methodZone roundUpLength: size). + processor flushICacheFrom: pic asUnsignedInteger to: pic asUnsignedInteger + size. ^pic! Item was changed: ----- Method: Cogit>>fillInMethodHeader:size:selector: (in category 'generate machine code') ----- fillInMethodHeader: method size: size selector: selector <returnTypeC: #'CogMethod *'> <var: #method type: #'CogMethod *'> <var: #originalMethod type: #'CogMethod *'> | methodHeader originalMethod | method cmType: CMMethod. method objectHeader: objectMemory nullHeaderForMachineCodeMethod. method blockSize: size. method methodObject: methodObj. methodHeader := coInterpreter rawHeaderOf: methodObj. "If the method has already been cogged (e.g. Newspeak accessors) then leave the original method attached to its cog method, but get the right header." (coInterpreter isCogMethodReference: methodHeader) ifTrue: [originalMethod := self cCoerceSimple: methodHeader to: #'CogMethod *'. self assert: originalMethod blockSize = size. methodHeader := originalMethod methodHeader. self cppIf: NewspeakVM ifTrue: [methodZone addToUnpairedMethodList: method]] ifFalse: [coInterpreter rawHeaderOf: methodObj put: method asInteger. self cppIf: NewspeakVM ifTrue: [method nextMethodOrIRCs: theIRCs]]. method methodHeader: methodHeader. method selector: selector. method cmNumArgs: (coInterpreter argumentCountOfMethodHeader: methodHeader). (method cmRefersToYoung: hasYoungReferent) ifTrue: [methodZone addToYoungReferrers: method]. method cmUsageCount: self initialMethodUsageCount. method cpicHasMNUCase: false. method cmUsesPenultimateLit: maxLitIndex >= ((objectMemory literalCountOfMethodHeader: methodHeader) - 2). method blockEntryOffset: (blockEntryLabel notNil ifTrue: [blockEntryLabel address - method asInteger] ifFalse: [0]). "This can be an error check since a large stackCheckOffset is caused by compiling a machine-code primitive, and hence depends on the Cogit, not the input method." needsFrame ifTrue: [stackCheckLabel address - method asInteger <= MaxStackCheckOffset ifFalse: [self error: 'too much code for stack check offset']]. method stackCheckOffset: (needsFrame ifTrue: [stackCheckLabel address - method asInteger] ifFalse: [0]). self assert: (backEnd callTargetFromReturnAddress: method asInteger + missOffset) = (self methodAbortTrampolineFor: method cmNumArgs). self assert: size = (methodZone roundUpLength: size). + processor flushICacheFrom: method asUnsignedInteger to: method asUnsignedInteger + size. ^method! Item was changed: ----- Method: Cogit>>fillInOPICHeader:size:numArgs:selector: (in category 'generate machine code') ----- fillInOPICHeader: pic size: size numArgs: numArgs selector: selector <returnTypeC: #'CogMethod *'> <var: #pic type: #'CogMethod *'> pic cmType: CMOpenPIC. pic objectHeader: 0. pic blockSize: size. "pic methodObject: 0.""This is also the nextOpenPIC link so don't initialize it" methodZone addToOpenPICList: pic. pic methodHeader: 0. pic selector: selector. pic cmNumArgs: numArgs. (pic cmRefersToYoung: (objectMemory isYoung: selector)) ifTrue: [methodZone addToYoungReferrers: pic]. pic cmUsageCount: self initialOpenPICUsageCount. pic cpicHasMNUCase: false. pic cPICNumCases: 0. pic blockEntryOffset: 0. self assert: pic cmType = CMOpenPIC. self assert: pic selector = selector. self assert: pic cmNumArgs = numArgs. self assert: (backEnd callTargetFromReturnAddress: pic asInteger + missOffset) = (self picAbortTrampolineFor: numArgs). self assert: size = (methodZone roundUpLength: size). + processor flushICacheFrom: pic asUnsignedInteger to: pic asUnsignedInteger + size. ^pic! Item was changed: ----- Method: Cogit>>generateCaptureCStackPointers: (in category 'initialization') ----- generateCaptureCStackPointers: captureFramePointer "Generate the routine that writes the current values of the C frame and stack pointers into variables. These are used to establish the C stack in trampolines back into the C run-time. This is a presumptuous quick hack for x86. It is presumptuous for two reasons. Firstly the system's frame and stack pointers may differ from those we use in generated code, e.g. on register-rich RISCs. Secondly the ABI may not support a simple frameless call as written here (for example 128-bit stack alignment on Mac OS X)." | startAddress | <inline: false> self allocateOpcodes: 32 bytecodes: 0. initialPC := 0. endPC := numAbstractOpcodes - 1. startAddress := methodZoneBase. captureFramePointer ifTrue: [self MoveR: FPReg Aw: self cFramePointerAddress]. "Capture the stack pointer prior to the call." backEnd leafCallStackPointerDelta = 0 ifTrue: [self MoveR: SPReg Aw: self cStackPointerAddress] ifFalse: [self MoveR: SPReg R: TempReg. self AddCq: backEnd leafCallStackPointerDelta R: TempReg. self MoveR: TempReg Aw: self cStackPointerAddress]. self RetN: 0. self outputInstructionsForGeneratedRuntimeAt: startAddress. + processor flushICacheFrom: startAddress to: methodZoneBase. self recordGeneratedRunTime: 'ceCaptureCStackPointers' address: startAddress. ceCaptureCStackPointers := self cCoerceSimple: startAddress to: #'void (*)(void)'! Item was changed: ----- Method: Cogit>>generateCogMethod: (in category 'generate machine code') ----- generateCogMethod: selector "We handle jump sizing simply. First we make a pass that asks each instruction to compute its maximum size. Then we make a pass that sizes jumps based on the maxmimum sizes. Then we make a pass that fixes up jumps. When fixing up a jump the jump is not allowed to choose a smaller offset but must stick to the size set in the second pass." <returnTypeC: #'CogMethod *'> | codeSize headerSize mapSize totalSize startAddress result method | <var: #method type: #'CogMethod *'> headerSize := self sizeof: CogMethod. methodLabel address: headerSize negated. self computeMaximumSizes. methodLabel concretizeAt: methodZone freeStart. codeSize := self generateInstructionsAt: methodLabel address + headerSize. mapSize := self generateMapAt: nil start: methodLabel address + cmNoCheckEntryOffset. totalSize := methodZone roundUpLength: headerSize + codeSize + mapSize. totalSize > MaxMethodSize ifTrue: [^self cCoerceSimple: MethodTooBig to: #'CogMethod *']. startAddress := methodZone allocate: totalSize. startAddress = 0 ifTrue: [^self cCoerceSimple: InsufficientCodeSpace to: #'CogMethod *']. self assert: startAddress + cmEntryOffset = entry address. self assert: startAddress + cmNoCheckEntryOffset = noCheckEntry address. result := self outputInstructionsAt: startAddress + headerSize. self assert: startAddress + headerSize + codeSize = result. backEnd padIfPossibleWithNopsFrom: result to: startAddress + totalSize - mapSize. self generateMapAt: startAddress + totalSize - 1 start: startAddress + cmNoCheckEntryOffset. self fillInBlockHeadersAt: startAddress. method := self fillInMethodHeader: (self cCoerceSimple: startAddress to: #'CogMethod *') size: totalSize selector: selector. postCompileHook notNil ifTrue: [self perform: postCompileHook with: method with: primInvokeLabel. postCompileHook := nil]. - processor flushICacheFrom: startAddress to: startAddress + headerSize + codeSize. ^method!

1 0

[commit][3345] CogVM source as per VMMaker.oscog-eem.1306
by commits＠squeakvm.org 15 May '15

15 May '15

Revision: 3345 Author: eliot Date: 2015-05-15 13:18:50 -0700 (Fri, 15 May 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1306 Fix old bug in ceMNUFromPICMNUMethod:receiver: that has been masked by cacheing of MNU method in MNU PIC entries. ceMNUFromPICMNUMethod:receiver: must set up lkupClass before calling handleMNU:... Make ARM rotated 8bit constants actually be correct(er) ie 16r4000001 (SmallInteger 16r2000000) work. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogitARMv5.c branches/Cog/nsspursrc/vm/cogitIA32.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/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogitARMv5.c branches/Cog/spursistasrc/vm/cogitIA32.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/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/vm/cogit.h branches/Cog/src/vm/cogitARMv5.c branches/Cog/src/vm/cogitIA32.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 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspursrc/vm/cogit.h 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + CCodeGenerator VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ Modified: branches/Cog/nsspursrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspursrc/vm/cogitARMv5.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + CCodeGenerator VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + StackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3452,7 +3452,7 @@ for (i9 = 2; i9 <= 30; i9 += 2) { if ((val2 & (((0xFF << i9) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i9)))) == val2) { rot8 = 32 - i9; - immediate13 = ((usqInt) val2) >> i9; + immediate13 = (((usqInt) val2) >> i9) | ((val2 << (32 - i9)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((BicOpcode << 21) | (1 << 20)))) | ((rn << 16) | (rd << 12))) | ((((((usqInt) rot8) >> 1) << 8) | immediate13) & 0xFFF)); self_in_dispatchConcretize; @@ -4084,7 +4084,7 @@ for (i1 = 2; i1 <= 30; i1 += 2) { if ((constant1 & (((0xFF << i1) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i1)))) == constant1) { rot = 32 - i1; - immediate = ((usqInt) constant1) >> i1; + immediate = (((usqInt) constant1) >> i1) | ((constant1 << (32 - i1)) & 0xFFFFFFFFUL); reg = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord4 = addsrnimmror(self_in_dispatchConcretize, reg, reg, immediate, rot); @@ -4112,7 +4112,7 @@ for (i = 2; i <= 30; i += 2) { if ((constant & (((0xFF << i) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i)))) == constant) { rot = 32 - i; - immediate = ((usqInt) constant) >> i; + immediate = (((usqInt) constant) >> i) | ((constant << (32 - i)) & 0xFFFFFFFFUL); reg = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord11 = subsrnimmror(self_in_dispatchConcretize, reg, reg, immediate, rot); @@ -4219,7 +4219,7 @@ for (i11 = 2; i11 <= 30; i11 += 2) { if ((val & (((0xFF << i11) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i11)))) == val) { rot1 = 32 - i11; - immediate1 = ((usqInt) val) >> i11; + immediate1 = (((usqInt) val) >> i11) | ((val << (32 - i11)) & 0xFFFFFFFFUL); reg1 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord5 = andsrnimmror(self_in_dispatchConcretize, reg1, reg1, immediate1, rot1); @@ -4256,7 +4256,7 @@ for (i2 = 2; i2 <= 30; i2 += 2) { if ((invVal & (((0xFF << i2) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i2)))) == invVal) { rot1 = 32 - i2; - immediate1 = ((usqInt) invVal) >> i2; + immediate1 = (((usqInt) invVal) >> i2) | ((invVal << (32 - i2)) & 0xFFFFFFFFUL); reg1 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord12 = bicsrnimmror(self_in_dispatchConcretize, reg1, reg1, immediate1, rot1); @@ -4342,7 +4342,7 @@ for (i12 = 2; i12 <= 30; i12 += 2) { if ((val1 & (((0xFF << i12) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i12)))) == val1) { rot2 = 32 - i12; - immediate2 = ((usqInt) val1) >> i12; + immediate2 = (((usqInt) val1) >> i12) | ((val1 << (32 - i12)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord6 = andsrnimmror(self_in_dispatchConcretize, dstReg, srcReg, immediate2, rot2); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord6; @@ -4374,7 +4374,7 @@ for (i3 = 2; i3 <= 30; i3 += 2) { if ((invVal1 & (((0xFF << i3) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i3)))) == invVal1) { rot2 = 32 - i3; - immediate2 = ((usqInt) invVal1) >> i3; + immediate2 = (((usqInt) invVal1) >> i3) | ((invVal1 << (32 - i3)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord13 = bicsrnimmror(self_in_dispatchConcretize, dstReg, srcReg, immediate2, rot2); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord13; @@ -4502,7 +4502,7 @@ for (i10 = 2; i10 <= 30; i10 += 2) { if ((val3 & (((0xFF << i10) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i10)))) == val3) { rot9 = 32 - i10; - immediate14 = ((usqInt) val3) >> i10; + immediate14 = (((usqInt) val3) >> i10) | ((val3 << (32 - i10)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((CmpOpcode << 21) | (1 << 20)))) | ((rn8 << 16) | (rd8 << 12))) | ((((((usqInt) rot9) >> 1) << 8) | immediate14) & 0xFFF)); self_in_dispatchConcretize; @@ -4639,7 +4639,7 @@ for (i16 = 2; i16 <= 30; i16 += 2) { if ((val4 & (((0xFF << i16) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i16)))) == val4) { rot10 = 32 - i16; - immediate15 = ((usqInt) val4) >> i16; + immediate15 = (((usqInt) val4) >> i16) | ((val4 << (32 - i16)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((OrOpcode << 21) | (1 << 20)))) | ((rn11 << 16) | (rd11 << 12))) | ((((((usqInt) rot10) >> 1) << 8) | immediate15) & 0xFFF)); self_in_dispatchConcretize; @@ -4759,7 +4759,7 @@ for (i13 = 2; i13 <= 30; i13 += 2) { if ((word & (((0xFF << i13) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i13)))) == word) { rot3 = 32 - i13; - immediate3 = ((usqInt) word) >> i13; + immediate3 = (((usqInt) word) >> i13) | ((word << (32 - i13)) & 0xFFFFFFFFUL); reg2 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord7 = subsrnimmror(self_in_dispatchConcretize, reg2, reg2, immediate3, rot3); @@ -4790,7 +4790,7 @@ for (i4 = 2; i4 <= 30; i4 += 2) { if (((-word) & (((0xFF << i4) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i4)))) == (-word)) { rot3 = 32 - i4; - immediate3 = ((usqInt) (-word)) >> i4; + immediate3 = (((usqInt) (-word)) >> i4) | (((-word) << (32 - i4)) & 0xFFFFFFFFUL); reg2 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord14 = addsrnimmror(self_in_dispatchConcretize, reg2, reg2, immediate3, rot3); @@ -4901,7 +4901,7 @@ for (i5 = 2; i5 <= 30; i5 += 2) { if ((constant2 & (((0xFF << i5) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i5)))) == constant2) { rot4 = 32 - i5; - immediate4 = ((usqInt) constant2) >> i5; + immediate4 = (((usqInt) constant2) >> i5) | ((constant2 << (32 - i5)) & 0xFFFFFFFFUL); reg3 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord8 = tstrnimmror(self_in_dispatchConcretize, reg3, reg3, immediate4, rot4); @@ -4967,7 +4967,7 @@ for (i17 = 2; i17 <= 30; i17 += 2) { if ((val5 & (((0xFF << i17) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i17)))) == val5) { rot11 = 32 - i17; - immediate16 = ((usqInt) val5) >> i17; + immediate16 = (((usqInt) val5) >> i17) | ((val5 << (32 - i17)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((XorOpcode << 21) | (1 << 20)))) | ((rn18 << 16) | (rd18 << 12))) | ((((((usqInt) rot11) >> 1) << 8) | immediate16) & 0xFFF)); self_in_dispatchConcretize; @@ -5099,7 +5099,7 @@ for (i6 = 2; i6 <= 30; i6 += 2) { if ((offset25 & (((0xFF << i6) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i6)))) == offset25) { rot5 = 32 - i6; - immediate5 = ((usqInt) offset25) >> i6; + immediate5 = (((usqInt) offset25) >> i6) | ((offset25 << (32 - i6)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord27 = addrnimmror(self_in_dispatchConcretize, destReg2, srcReg3, immediate5, rot5 << 1); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord27; @@ -5233,7 +5233,7 @@ for (i14 = 2; i14 <= 30; i14 += 2) { if ((word1 & (((0xFF << i14) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i14)))) == word1) { rot6 = 32 - i14; - immediate6 = ((usqInt) word1) >> i14; + immediate6 = (((usqInt) word1) >> i14) | ((word1 << (32 - i14)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord29 = movimmror(self_in_dispatchConcretize, reg5, immediate6, rot6); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord29; @@ -5264,7 +5264,7 @@ for (i7 = 2; i7 <= 30; i7 += 2) { if ((invVal2 & (((0xFF << i7) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i7)))) == invVal2) { rot6 = 32 - i7; - immediate6 = ((usqInt) invVal2) >> i7; + immediate6 = (((usqInt) invVal2) >> i7) | ((invVal2 << (32 - i7)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord113 = mvnimmror(self_in_dispatchConcretize, reg5, immediate6, rot6); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord113; @@ -5817,7 +5817,7 @@ for (i15 = 2; i15 <= 30; i15 += 2) { if ((word2 & (((0xFF << i15) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i15)))) == word2) { rot7 = 32 - i15; - immediate12 = ((usqInt) word2) >> i15; + immediate12 = (((usqInt) word2) >> i15) | ((word2 << (32 - i15)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord60 = movimmror(self_in_dispatchConcretize, ConcreteIPReg, immediate12, rot7); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord60; @@ -5847,7 +5847,7 @@ for (i8 = 2; i8 <= 30; i8 += 2) { if ((invVal3 & (((0xFF << i8) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i8)))) == invVal3) { rot7 = 32 - i8; - immediate12 = ((usqInt) invVal3) >> i8; + immediate12 = (((usqInt) invVal3) >> i8) | ((invVal3 << (32 - i8)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord123 = mvnimmror(self_in_dispatchConcretize, ConcreteIPReg, immediate12, rot7); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord123; @@ -6666,7 +6666,7 @@ for (i1 = 2; i1 <= 30; i1 += 2) { if ((distance & (((0xFF << i1) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i1)))) == distance) { rot = 32 - i1; - immediate = ((usqInt) distance) >> i1; + immediate = (((usqInt) distance) >> i1) | ((distance << (32 - i1)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord = addrnimmror(self_in_loadCwInto, destReg, PC, immediate, rot); ((self_in_loadCwInto->machineCode))[0 / 4] = aWord; @@ -6690,7 +6690,7 @@ for (i = 2; i <= 30; i += 2) { if ((constant & (((0xFF << i) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i)))) == constant) { rot = 32 - i; - immediate = ((usqInt) constant) >> i; + immediate = (((usqInt) constant) >> i) | ((constant << (32 - i)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord1 = subrnimmror(self_in_loadCwInto, destReg, PC, immediate, rot); ((self_in_loadCwInto->machineCode))[0 / 4] = aWord1; @@ -9618,7 +9618,7 @@ { sqInt classIndex; sqInt i; - sqInt pc; + usqInt pc; pc = (((((usqInt)cPIC)) + firstCPICCaseOffset) + cPICCaseSize) - (jumpLongConditionalByteSize(backEnd)); for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { @@ -23951,6 +23951,7 @@ } else { assert(unforwardRcvr); + assert(!((((ssTop())->spilled)))); rcvrReg1 = allocateRegForStackEntryAtnotConflictingWith(1, 0); popToReg(ssValue(1), rcvrReg1); } Modified: branches/Cog/nsspursrc/vm/cogitIA32.c =================================================================== --- branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspursrc/vm/cogitIA32.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + CCodeGenerator VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - StackToRegisterMappingCogit VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + StackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -22707,6 +22707,7 @@ } else { assert(unforwardRcvr); + assert(!((((ssTop())->spilled)))); rcvrReg1 = allocateRegForStackEntryAtnotConflictingWith(1, 0); popToReg(ssValue(1), rcvrReg1); } Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspursrc/vm/cointerp.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - CoInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CoInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1188,7 +1188,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -usqInt stringForCString(const char *aCString); +sqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -1597,9 +1597,9 @@ _iss sqInt numStackPages; _iss StackPage * mostRecentlyUsedPage; _iss SpurNewSpaceSpace pastSpace; +_iss sqInt lkupClass; _iss sqInt longRunningPrimitiveCheckMethod; _iss usqInt oldSpaceStart; -_iss sqInt lkupClass; _iss sqLong nextProfileTick; _iss sqInt tempOop2; _iss sqInt numClassTablePages; @@ -2378,7 +2378,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.1298"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1306"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -15779,7 +15779,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; - sqInt theIP; + usqInt theIP; assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); assertl(addressIsInPage(GIV(stackPage), lifp), ln); @@ -16953,8 +16953,8 @@ return interpretMethodFromMachineCode(); } handleMNUInMachineCodeToclassForMessage(SelectorDoesNotUnderstand, rcvr, (((tagBits1 = rcvr & 3)) != 0 - ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord()))) - : fetchClassOfNonImm(rcvr))); + ? (GIV(lkupClass) = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord())))) + : (GIV(lkupClass) = fetchClassOfNonImm(rcvr)))); assert(0); } @@ -24105,7 +24105,7 @@ int index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -33057,7 +33057,7 @@ sqInt arg; sqInt fmt; sqInt i; - usqInt length; + sqInt length; usqInt numBytes; usqInt numSlots; usqInt numSlots1; @@ -33098,18 +33098,18 @@ /* bytes (the common case), including CompiledMethod */ - length = ((sqInt) (numBytes - (fmt & 7))); + length = numBytes - (fmt & 7); goto l1; } if (fmt <= 9) { - length = ((sqInt) numBytes); + length = numBytes; goto l1; } if (fmt >= 12) { - length = ((sqInt) (numBytes - ((fmt & 3) << 1))); + length = numBytes - ((fmt & 3) << 1); goto l1; } - length = ((sqInt) (numBytes - ((fmt & 1) << 2))); + length = numBytes - ((fmt & 1) << 2); l1: /* end numBytesOf: */; if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F)) && (length == (numBytesOf(arg))))) { @@ -33127,9 +33127,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - length = (numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1); + length = ((usqInt) ((numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1))); if (!((isAppropriateForCopyObject(arg)) && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) { (GIV(primFailCode) = PrimErrBadArgument); @@ -43062,7 +43062,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -43163,7 +43163,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); + newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -59208,13 +59208,13 @@ sqInt obj21; sqInt pigBytes; usqInt prevFree; - usqInt prevFreeChunk; + sqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; - usqInt thisFreeChunk; + sqInt thisFreeChunk; sqInt usedChunk; nextNext = 0; @@ -62910,7 +62910,7 @@ /* Answer a new String copied from a null-terminated C string, or nil if out of memory. */ -usqInt +sqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; @@ -63833,7 +63833,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -78740,7 +78740,7 @@ sqInt header1; sqInt i; sqInt methodHeader; - sqInt numSlots; + usqInt numSlots; usqInt numSlots1; sqInt rcvr; char *sp; @@ -78796,9 +78796,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - numSlots = ((usqInt) ((numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1))); + numSlots = (numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1); } } else { Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspursrc/vm/cointerp.h 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ @@ -261,7 +261,7 @@ sqInt splObj(sqInt index); usqInt storeCheckBoundary(void); sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -usqInt stringForCString(const char *aCString); +sqInt stringForCString(const char *aCString); void tenuringIncrementalGC(void); sqInt topRemappableOop(void); sqInt validFreeTree(void); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - CoInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CoInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1191,7 +1191,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -usqInt stringForCString(const char *aCString); +sqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -1600,9 +1600,9 @@ _iss sqInt numStackPages; _iss StackPage * mostRecentlyUsedPage; _iss SpurNewSpaceSpace pastSpace; +_iss sqInt lkupClass; _iss sqInt longRunningPrimitiveCheckMethod; _iss usqInt oldSpaceStart; -_iss sqInt lkupClass; _iss sqLong nextProfileTick; _iss sqInt tempOop2; _iss sqInt numClassTablePages; @@ -2381,7 +2381,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.1298"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1306"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -15788,7 +15788,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; - sqInt theIP; + usqInt theIP; assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); assertl(addressIsInPage(GIV(stackPage), lifp), ln); @@ -16962,8 +16962,8 @@ return interpretMethodFromMachineCode(); } handleMNUInMachineCodeToclassForMessage(SelectorDoesNotUnderstand, rcvr, (((tagBits1 = rcvr & 3)) != 0 - ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord()))) - : fetchClassOfNonImm(rcvr))); + ? (GIV(lkupClass) = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord())))) + : (GIV(lkupClass) = fetchClassOfNonImm(rcvr)))); assert(0); } @@ -24114,7 +24114,7 @@ int index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -33066,7 +33066,7 @@ sqInt arg; sqInt fmt; sqInt i; - usqInt length; + sqInt length; usqInt numBytes; usqInt numSlots; usqInt numSlots1; @@ -33107,18 +33107,18 @@ /* bytes (the common case), including CompiledMethod */ - length = ((sqInt) (numBytes - (fmt & 7))); + length = numBytes - (fmt & 7); goto l1; } if (fmt <= 9) { - length = ((sqInt) numBytes); + length = numBytes; goto l1; } if (fmt >= 12) { - length = ((sqInt) (numBytes - ((fmt & 3) << 1))); + length = numBytes - ((fmt & 3) << 1); goto l1; } - length = ((sqInt) (numBytes - ((fmt & 1) << 2))); + length = numBytes - ((fmt & 1) << 2); l1: /* end numBytesOf: */; if (!((((((usqInt) (longAt(rcvr))) >> 24) & 0x1F) == ((((usqInt) (longAt(arg))) >> 24) & 0x1F)) && (length == (numBytesOf(arg))))) { @@ -33136,9 +33136,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - length = (numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1); + length = ((usqInt) ((numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1))); if (!((isAppropriateForCopyObject(arg)) && (length == (lengthOfformat(arg, (((usqInt) (longAt(arg))) >> 24) & 0x1F))))) { (GIV(primFailCode) = PrimErrBadArgument); @@ -43071,7 +43071,7 @@ sqInt fillValue; sqInt hash; sqInt instSpec; - usqInt newObj; + sqInt newObj; usqInt newObj1; usqInt numBytes; usqInt numSlots; @@ -43172,7 +43172,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - newObj = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex); + newObj = ((usqInt) (allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, instSpec, classIndex))); goto l1; } if (numSlots >= 0xFF) { @@ -59217,13 +59217,13 @@ sqInt obj21; sqInt pigBytes; usqInt prevFree; - usqInt prevFreeChunk; + sqInt prevFreeChunk; usqInt prevPrevFree; - usqInt prevPrevFreeChunk; + sqInt prevPrevFreeChunk; sqInt slotBytes; sqInt slotBytes1; usqInt there; - usqInt thisFreeChunk; + sqInt thisFreeChunk; sqInt usedChunk; nextNext = 0; @@ -62919,7 +62919,7 @@ /* Answer a new String copied from a null-terminated C string, or nil if out of memory. */ -usqInt +sqInt stringForCString(const char *aCString) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt formatField; @@ -63842,7 +63842,7 @@ sqInt largeChild; sqInt newEndOfMemory; sqInt next; - sqInt node; + usqInt node; SpurSegmentInfo *seg; sqInt smallChild; sqInt treeNode; @@ -78749,7 +78749,7 @@ sqInt header1; sqInt i; sqInt methodHeader; - sqInt numSlots; + usqInt numSlots; usqInt numSlots1; sqInt rcvr; char *sp; @@ -78805,9 +78805,9 @@ flag("endianness"); assert((classIndexOf(rcvr)) > (isForwardedObjectClassIndexPun())); numSlots1 = byteAt(rcvr + 7); - numSlots = ((usqInt) ((numSlots1 == 0xFF - ? longAt(rcvr - BaseHeaderSize) - : numSlots1))); + numSlots = (numSlots1 == 0xFF + ? longAt(rcvr - BaseHeaderSize) + : numSlots1); } } else { Modified: branches/Cog/nsspurstack64src/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspurstack64src/vm/gcc3x-interp.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - StackInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + StackInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2149,7 +2149,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1298"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1306"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/nsspurstack64src/vm/interp.c =================================================================== --- branches/Cog/nsspurstack64src/vm/interp.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspurstack64src/vm/interp.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - StackInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + StackInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2146,7 +2146,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1298"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1306"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - StackInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + StackInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2120,7 +2120,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1298"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1306"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - StackInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + StackInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2117,7 +2117,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1298"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreterPrimitives_VMMaker.oscog-eem.1306"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Thu May 14 19:29:26 PDT 2015 + Fri May 15 13:17:35 PDT 2015 Modified: branches/Cog/spursistasrc/vm/cogit.h =================================================================== --- branches/Cog/spursistasrc/vm/cogit.h 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/spursistasrc/vm/cogit.h 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + CCodeGenerator VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ Modified: branches/Cog/spursistasrc/vm/cogitARMv5.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/spursistasrc/vm/cogitARMv5.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + CCodeGenerator VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3453,7 +3453,7 @@ for (i9 = 2; i9 <= 30; i9 += 2) { if ((val2 & (((0xFF << i9) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i9)))) == val2) { rot8 = 32 - i9; - immediate13 = ((usqInt) val2) >> i9; + immediate13 = (((usqInt) val2) >> i9) | ((val2 << (32 - i9)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((BicOpcode << 21) | (1 << 20)))) | ((rn << 16) | (rd << 12))) | ((((((usqInt) rot8) >> 1) << 8) | immediate13) & 0xFFF)); self_in_dispatchConcretize; @@ -4085,7 +4085,7 @@ for (i1 = 2; i1 <= 30; i1 += 2) { if ((constant1 & (((0xFF << i1) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i1)))) == constant1) { rot = 32 - i1; - immediate = ((usqInt) constant1) >> i1; + immediate = (((usqInt) constant1) >> i1) | ((constant1 << (32 - i1)) & 0xFFFFFFFFUL); reg = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord4 = addsrnimmror(self_in_dispatchConcretize, reg, reg, immediate, rot); @@ -4113,7 +4113,7 @@ for (i = 2; i <= 30; i += 2) { if ((constant & (((0xFF << i) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i)))) == constant) { rot = 32 - i; - immediate = ((usqInt) constant) >> i; + immediate = (((usqInt) constant) >> i) | ((constant << (32 - i)) & 0xFFFFFFFFUL); reg = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord11 = subsrnimmror(self_in_dispatchConcretize, reg, reg, immediate, rot); @@ -4220,7 +4220,7 @@ for (i11 = 2; i11 <= 30; i11 += 2) { if ((val & (((0xFF << i11) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i11)))) == val) { rot1 = 32 - i11; - immediate1 = ((usqInt) val) >> i11; + immediate1 = (((usqInt) val) >> i11) | ((val << (32 - i11)) & 0xFFFFFFFFUL); reg1 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord5 = andsrnimmror(self_in_dispatchConcretize, reg1, reg1, immediate1, rot1); @@ -4257,7 +4257,7 @@ for (i2 = 2; i2 <= 30; i2 += 2) { if ((invVal & (((0xFF << i2) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i2)))) == invVal) { rot1 = 32 - i2; - immediate1 = ((usqInt) invVal) >> i2; + immediate1 = (((usqInt) invVal) >> i2) | ((invVal << (32 - i2)) & 0xFFFFFFFFUL); reg1 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord12 = bicsrnimmror(self_in_dispatchConcretize, reg1, reg1, immediate1, rot1); @@ -4343,7 +4343,7 @@ for (i12 = 2; i12 <= 30; i12 += 2) { if ((val1 & (((0xFF << i12) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i12)))) == val1) { rot2 = 32 - i12; - immediate2 = ((usqInt) val1) >> i12; + immediate2 = (((usqInt) val1) >> i12) | ((val1 << (32 - i12)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord6 = andsrnimmror(self_in_dispatchConcretize, dstReg, srcReg, immediate2, rot2); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord6; @@ -4375,7 +4375,7 @@ for (i3 = 2; i3 <= 30; i3 += 2) { if ((invVal1 & (((0xFF << i3) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i3)))) == invVal1) { rot2 = 32 - i3; - immediate2 = ((usqInt) invVal1) >> i3; + immediate2 = (((usqInt) invVal1) >> i3) | ((invVal1 << (32 - i3)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord13 = bicsrnimmror(self_in_dispatchConcretize, dstReg, srcReg, immediate2, rot2); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord13; @@ -4503,7 +4503,7 @@ for (i10 = 2; i10 <= 30; i10 += 2) { if ((val3 & (((0xFF << i10) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i10)))) == val3) { rot9 = 32 - i10; - immediate14 = ((usqInt) val3) >> i10; + immediate14 = (((usqInt) val3) >> i10) | ((val3 << (32 - i10)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((CmpOpcode << 21) | (1 << 20)))) | ((rn8 << 16) | (rd8 << 12))) | ((((((usqInt) rot9) >> 1) << 8) | immediate14) & 0xFFF)); self_in_dispatchConcretize; @@ -4640,7 +4640,7 @@ for (i16 = 2; i16 <= 30; i16 += 2) { if ((val4 & (((0xFF << i16) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i16)))) == val4) { rot10 = 32 - i16; - immediate15 = ((usqInt) val4) >> i16; + immediate15 = (((usqInt) val4) >> i16) | ((val4 << (32 - i16)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((OrOpcode << 21) | (1 << 20)))) | ((rn11 << 16) | (rd11 << 12))) | ((((((usqInt) rot10) >> 1) << 8) | immediate15) & 0xFFF)); self_in_dispatchConcretize; @@ -4760,7 +4760,7 @@ for (i13 = 2; i13 <= 30; i13 += 2) { if ((word & (((0xFF << i13) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i13)))) == word) { rot3 = 32 - i13; - immediate3 = ((usqInt) word) >> i13; + immediate3 = (((usqInt) word) >> i13) | ((word << (32 - i13)) & 0xFFFFFFFFUL); reg2 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord7 = subsrnimmror(self_in_dispatchConcretize, reg2, reg2, immediate3, rot3); @@ -4791,7 +4791,7 @@ for (i4 = 2; i4 <= 30; i4 += 2) { if (((-word) & (((0xFF << i4) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i4)))) == (-word)) { rot3 = 32 - i4; - immediate3 = ((usqInt) (-word)) >> i4; + immediate3 = (((usqInt) (-word)) >> i4) | (((-word) << (32 - i4)) & 0xFFFFFFFFUL); reg2 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord14 = addsrnimmror(self_in_dispatchConcretize, reg2, reg2, immediate3, rot3); @@ -4902,7 +4902,7 @@ for (i5 = 2; i5 <= 30; i5 += 2) { if ((constant2 & (((0xFF << i5) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i5)))) == constant2) { rot4 = 32 - i5; - immediate4 = ((usqInt) constant2) >> i5; + immediate4 = (((usqInt) constant2) >> i5) | ((constant2 << (32 - i5)) & 0xFFFFFFFFUL); reg3 = concreteRegister(self_in_dispatchConcretize, ((self_in_dispatchConcretize->operands))[1]); /* begin machineCodeAt:put: */ aWord8 = tstrnimmror(self_in_dispatchConcretize, reg3, reg3, immediate4, rot4); @@ -4968,7 +4968,7 @@ for (i17 = 2; i17 <= 30; i17 += 2) { if ((val5 & (((0xFF << i17) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i17)))) == val5) { rot11 = 32 - i17; - immediate16 = ((usqInt) val5) >> i17; + immediate16 = (((usqInt) val5) >> i17) | ((val5 << (32 - i17)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ ((self_in_dispatchConcretize->machineCode))[0 / 4] = ((((AL << 28) | ((1 << 25) | ((XorOpcode << 21) | (1 << 20)))) | ((rn18 << 16) | (rd18 << 12))) | ((((((usqInt) rot11) >> 1) << 8) | immediate16) & 0xFFF)); self_in_dispatchConcretize; @@ -5100,7 +5100,7 @@ for (i6 = 2; i6 <= 30; i6 += 2) { if ((offset25 & (((0xFF << i6) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i6)))) == offset25) { rot5 = 32 - i6; - immediate5 = ((usqInt) offset25) >> i6; + immediate5 = (((usqInt) offset25) >> i6) | ((offset25 << (32 - i6)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord27 = addrnimmror(self_in_dispatchConcretize, destReg2, srcReg3, immediate5, rot5 << 1); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord27; @@ -5234,7 +5234,7 @@ for (i14 = 2; i14 <= 30; i14 += 2) { if ((word1 & (((0xFF << i14) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i14)))) == word1) { rot6 = 32 - i14; - immediate6 = ((usqInt) word1) >> i14; + immediate6 = (((usqInt) word1) >> i14) | ((word1 << (32 - i14)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord29 = movimmror(self_in_dispatchConcretize, reg5, immediate6, rot6); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord29; @@ -5265,7 +5265,7 @@ for (i7 = 2; i7 <= 30; i7 += 2) { if ((invVal2 & (((0xFF << i7) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i7)))) == invVal2) { rot6 = 32 - i7; - immediate6 = ((usqInt) invVal2) >> i7; + immediate6 = (((usqInt) invVal2) >> i7) | ((invVal2 << (32 - i7)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord113 = mvnimmror(self_in_dispatchConcretize, reg5, immediate6, rot6); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord113; @@ -5818,7 +5818,7 @@ for (i15 = 2; i15 <= 30; i15 += 2) { if ((word2 & (((0xFF << i15) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i15)))) == word2) { rot7 = 32 - i15; - immediate12 = ((usqInt) word2) >> i15; + immediate12 = (((usqInt) word2) >> i15) | ((word2 << (32 - i15)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord60 = movimmror(self_in_dispatchConcretize, ConcreteIPReg, immediate12, rot7); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord60; @@ -5848,7 +5848,7 @@ for (i8 = 2; i8 <= 30; i8 += 2) { if ((invVal3 & (((0xFF << i8) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i8)))) == invVal3) { rot7 = 32 - i8; - immediate12 = ((usqInt) invVal3) >> i8; + immediate12 = (((usqInt) invVal3) >> i8) | ((invVal3 << (32 - i8)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord123 = mvnimmror(self_in_dispatchConcretize, ConcreteIPReg, immediate12, rot7); ((self_in_dispatchConcretize->machineCode))[0 / 4] = aWord123; @@ -6667,7 +6667,7 @@ for (i1 = 2; i1 <= 30; i1 += 2) { if ((distance & (((0xFF << i1) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i1)))) == distance) { rot = 32 - i1; - immediate = ((usqInt) distance) >> i1; + immediate = (((usqInt) distance) >> i1) | ((distance << (32 - i1)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord = addrnimmror(self_in_loadCwInto, destReg, PC, immediate, rot); ((self_in_loadCwInto->machineCode))[0 / 4] = aWord; @@ -6691,7 +6691,7 @@ for (i = 2; i <= 30; i += 2) { if ((constant & (((0xFF << i) & 0xFFFFFFFFUL) | (((usqInt) 0xFF) >> (32 - i)))) == constant) { rot = 32 - i; - immediate = ((usqInt) constant) >> i; + immediate = (((usqInt) constant) >> i) | ((constant << (32 - i)) & 0xFFFFFFFFUL); /* begin machineCodeAt:put: */ aWord1 = subrnimmror(self_in_loadCwInto, destReg, PC, immediate, rot); ((self_in_loadCwInto->machineCode))[0 / 4] = aWord1; @@ -20296,6 +20296,7 @@ } else { assert(unforwardRcvr); + assert(!((((ssTop())->spilled)))); rcvrReg1 = allocateRegForStackEntryAtnotConflictingWith(1, 0); popToReg(ssValue(1), rcvrReg1); } @@ -20516,6 +20517,7 @@ } else { assert(unforwardRcvr); + assert(!((((ssTop())->spilled)))); rcvrReg1 = allocateRegForStackEntryAtnotConflictingWith(1, 0); popToReg(ssValue(1), rcvrReg1); } Modified: branches/Cog/spursistasrc/vm/cogitIA32.c =================================================================== --- branches/Cog/spursistasrc/vm/cogitIA32.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/spursistasrc/vm/cogitIA32.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + CCodeGenerator VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa + SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1303 uuid: d796217a-dcf4-47eb-9a63-579a7e69a7fa " __DATE__ ; +static char __buildInfo[] = "SistaStackToRegisterMappingCogit VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -19041,6 +19041,7 @@ } else { assert(unforwardRcvr); + assert(!((((ssTop())->spilled)))); rcvrReg1 = allocateRegForStackEntryAtnotConflictingWith(1, 0); popToReg(ssValue(1), rcvrReg1); } @@ -19261,6 +19262,7 @@ } else { assert(unforwardRcvr); + assert(!((((ssTop())->spilled)))); rcvrReg1 = allocateRegForStackEntryAtnotConflictingWith(1, 0); popToReg(ssValue(1), rcvrReg1); } Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2015-05-15 15:10:53 UTC (rev 3344) +++ branches/Cog/spursistasrc/vm/cointerp.c 2015-05-15 20:18:50 UTC (rev 3345) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 from - CoInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def + CoInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1298 uuid: da9fd4c2-e7e4-48c1-bfb6-87139d690def " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1306 uuid: 88864d96-33bb-4285-9fb5-02d57043a1e2 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1186,7 +1186,7 @@ static sqInt storeImageSegmentIntooutPointersroots(sqInt segmentWordArray, sqInt outPointerArray, sqInt arrayOfRoots) NoDbgRegParms; sqInt storePointerUncheckedofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); sqInt storePointerofObjectwithValue(sqInt fieldIndex, sqInt objOop, sqInt valuePointer); -sqInt stringForCString(const char *aCString); +usqInt stringForCString(const char *aCString); static sqInt sufficientSpaceAfterGC(sqInt numBytes) NoDbgRegParms; static sqInt swizzleObjStackAt(sqInt objStackRootIndex) NoDbgRegParms; void tenuringIncrementalGC(void); @@ -1617,6 +1617,7 @@ _iss sqInt previousRememberedSetSize; _iss sqInt classNameIndex; _iss sqInt ephemeronQueue; +_iss sqInt lkupClass; _iss sqInt tenureCriterion; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt metaclassNumSlots; @@ -1625,7 +1626,6 @@ _iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; -_iss sqInt lkupClass; _iss usqLong nextWakeupUsecs; _iss sqInt numSegInfos; _iss sqInt cogCodeSize; @@ -2375,7 +2375,7 @@ /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1298]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreterPrimitives VMMaker.oscog-eem.1306]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -14920,7 +14920,7 @@ CogMethod *cogMethod; sqInt methodField; sqInt methodField1; - usqInt theIP; + sqInt theIP; assertl(GIV(stackPage) == (mostRecentlyUsedPage()), ln); assertl(addressIsInPage(GIV(stackPage), lifp), ln); @@ -15922,8 +15922,8 @@ return interpretMethodFromMachineCode(); } handleMNUInMachineCodeToclassForMessage(SelectorDoesNotUnderstand, rcvr, (((tagBits1 = rcvr & 3)) != 0 - ? longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord()))) - : fetchClassOfNonImm(rcvr))); + ? (GIV(lkupClass) = longAt((GIV(classTableFirstPage) + BaseHeaderSize) + (tagBits1 << (shiftForWord())))) + : (GIV(lkupClass) = fetchClassOfNonImm(rcvr)))); assert(0); } @@ -22761,7 +22761,7 @@ int index; sqInt methodField; usqInt numArgs; - usqInt numTemps; + sqInt numTemps; char *rcvrAddress; sqInt rcvrOrClosure; sqInt theMethod; @@ -30456,7 +30456,7 @@ GIV(needGCFlag) = 1; forceInterruptCheck(); } - s = allocateSlotsInOldSpacebytesformatclassIndex(numSlots, numBytes, formatField, ClassByteStringCompactIndex); @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
16
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 May 2015