Quantcast

VM Maker: VMMaker.oscog-eem.2192.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

VM Maker: VMMaker.oscog-eem.2192.mcz

commits-2
 
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2192.mcz

==================== Summary ====================

Name: VMMaker.oscog-eem.2192
Author: eem
Time: 12 April 2017, 11:55:28.37044 am
UUID: 5c76ddfa-fe83-4088-95e0-780dad08ab10
Ancestors: VMMaker.oscog-eem.2191

SiatCogit:
Fix mapping errors for genExtStorePopRemoteTemp & genSistaExtStoreAndPopReceiverVariableBytecode.

Add some simulatiuon support for ensureAllocatableSlots:, and a shortcut for symbolicMethod:.

=============== Diff against VMMaker.oscog-eem.2191 ===============

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 head frame' action: [self printFrame: cogit processor fp WithSP: cogit processor sp];
  add: 'short print ext head frame & callers' action: [self shortPrintFrameAndCallers: framePointer];
  add: 'short print int head frame & callers' action: [self shortPrintFrameAndCallers: localFP];
  add: 'short print mc/cog head frame & callers' action: [self shortPrintFrameAndCallers: cogit processor fp];
  add: 'long print ext head frame & callers' action: [self printFrameAndCallers: framePointer SP: stackPointer];
  add: 'long print int head frame & callers' action: [self printFrameAndCallers: localFP SP: localSP];
  add: 'long print mc/cog head 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 pc.
  self externalWriteBackHeadFramePointers];
  addLine;
  add: 'print rump C stack' action: [objectMemory printMemoryFrom: cogit processor sp to: cogit getCStackPointer];
  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 codeEntryFor: cogit processor pc) isNil
   and: [(cogit methodZone methodFor: cogit processor pc) = 0])
  ifTrue: [instructionPointer]
  ifFalse: [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]];
+ add: 'symbolic method...' action: [(self promptHex: 'method bytecodes') ifNotNil: [:oop| self symbolicMethod: oop]];
  addLine;
  add: 'inspect object memory' target: objectMemory action: #inspect;
  add: 'run leak checker' action: [Cursor execute showWhile: [self runLeakChecker]];
  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 methods with method...' action:
  [(self promptHex: 'method') ifNotNil: [:methodOop|
  cogMethodZone methodsDo:
  [:m|
  m methodObject = methodOop 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: (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: (cogit singleStep
  ifTrue: ['no single step']
  ifFalse: ['single step'])
  action: [cogit singleStep: cogit singleStep not];
  add: 'click step' action: [cogit setClickStepBreakBlock];
  add: 'set break pc', cogit breakPC menuPrompt, '...-ve to disable or remove' action: [cogit promptForBreakPC];
  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 added:
+ ----- Method: Spur32BitMMLECoSimulator>>needGCFlag: (in category 'accessing') -----
+ needGCFlag: anInteger
+ needGCFlag := anInteger ~= 0!

Item was added:
+ ----- Method: Spur64BitMMLECoSimulator>>needGCFlag: (in category 'accessing') -----
+ needGCFlag: anInteger
+ needGCFlag := anInteger ~= 0!

Item was changed:
  ----- Method: StackToRegisterMappingCogit>>genExtStorePopRemoteTempOrInstVarLongBytecodePopBoolean: (in category 'bytecode generators') -----
  genExtStorePopRemoteTempOrInstVarLongBytecodePopBoolean: boolean
  | index maybeContext needsStoreCheck needsImmCheck |
  needsStoreCheck := self sistaNeedsStoreCheck.
  maybeContext := self extBSpecifiesMaybeContext.
  needsImmCheck := self extBSpecifiesImmCheck.
  extB := 0.
  numExtB := 0.
  (byte2 noMask: coInterpreter remoteIsInstVarAccess)
  ifTrue:
  [ self
  genStorePop: boolean
  RemoteTemp: byte1
  At: byte2
  needsStoreCheck: needsStoreCheck.
  self cppIf: IMMUTABILITY ifTrue: [ self annotateBytecode: self Label ] ]
  ifFalse:
  [index := byte1 + (extA << 8).
  extA := 0.
  ((coInterpreter isWriteMediatedContextInstVarIndex: index) and: [ maybeContext ])
  ifTrue: [self
  genStorePop: boolean
  MaybeContextRemoteInstVar: index
  ofObjectAt: byte2 - coInterpreter remoteIsInstVarAccess
  needsStoreCheck: needsStoreCheck
  needsImmutabilityCheck: needsImmCheck ]
  ifFalse: [self
  genStorePop: boolean
  RemoteInstVar: index
  ofObjectAt: byte2 - coInterpreter remoteIsInstVarAccess
  needsStoreCheck: needsStoreCheck
+ needsImmutabilityCheck: needsImmCheck ].
+ self cppIf: IMMUTABILITY ifTrue: [ needsImmCheck ifFalse: [self annotateBytecode: self Label ] ] ].
- needsImmutabilityCheck: needsImmCheck ] ].
  ^ 0!

Item was changed:
  ----- Method: StackToRegisterMappingCogit>>genSistaExtStoreAndPopReceiverVariableBytecodePopBoolean: (in category 'bytecode generators') -----
  genSistaExtStoreAndPopReceiverVariableBytecodePopBoolean: popBoolean
  <inline: true>
+ | index needsStoreCheck needsImmCheck maybeContext result |
- | index needsStoreCheck needsImmCheck maybeContext |
  needsStoreCheck := self sistaNeedsStoreCheck.
  needsImmCheck := self extBSpecifiesImmCheck.
  "Long form and short form exist for popInto. Only the long form exists for store.
  Store have an explicit flag to mark context accessing, while popInto context accessing are done through the long form,
  hence generate the context form if the flag is set or if this is a popInto."
  maybeContext := popBoolean or: [self extBSpecifiesMaybeContext].
  extB := 0.
  numExtB := 0.
  index := byte1 + (extA << 8).
  extA := 0.
+ result := ((coInterpreter isWriteMediatedContextInstVarIndex: index) and: [maybeContext])
- ^((coInterpreter isWriteMediatedContextInstVarIndex: index) and: [maybeContext])
  ifTrue: [self
  genStorePop: popBoolean
  MaybeContextReceiverVariable: index
  needsStoreCheck: needsStoreCheck
  needsImmutabilityCheck: needsImmCheck]
  ifFalse: [self
  genStorePop: popBoolean
  ReceiverVariable: index
  needsStoreCheck: needsStoreCheck
+ needsImmutabilityCheck: needsImmCheck].
+ self cppIf: IMMUTABILITY ifTrue: [ needsImmCheck ifFalse: [self annotateBytecode: self Label ] ].
+ ^result!
- needsImmutabilityCheck: needsImmCheck]!

Loading...