[Vm-dev] VM Maker: Cog-eem.337.mcz

[commits at source.squeak.org]

Eliot Miranda uploaded a new version of Cog to project VM Maker:
http://source.squeak.org/VMMaker/Cog-eem.337.mcz

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

Name: Cog-eem.337
Author: eem
Time: 24 February 2017, 4:08:30.829071 pm
UUID: e412f1eb-4517-4759-bbfd-c1257d460238
Ancestors: Cog-eem.336

Restore inadvertent deletions.

=============== Diff against Cog-eem.336 ===============

Item was added:
+ ----- Method: BochsPlugin>>primitiveDisassembleAt:InMemory: (in category 'primitives') -----
+ "cpuAlien <BochsIA32|X86Alien>" primitiveDisassembleAt: address "<Integer>" InMemory: memory "<Bitmap|ByteArray|WordArray>"
+ 	"Return an Array of the instruction length and its decompilation as a string for the instruction at address in memory."
+ 	| cpuAlien cpu instrLenOrErr resultObj log logLen logObj logObjData |
+ 	<var: #cpu type: #'void *'>
+ 	<var: #log type: #'char *'>
+ 	<var: #logLen type: #long>
+ 	<var: #logObjData type: #'char *'>
+ 	cpuAlien := self primitive: #primitiveDisassembleAtInMemory
+ 					parameters: #(Unsigned WordsOrBytes)
+ 					receiver: #Oop.
+ 	(cpu := self cCoerceSimple: (self startOfData: cpuAlien) to: #'void *') = 0 ifTrue:
+ 		[^interpreterProxy primitiveFailFor: PrimErrBadReceiver].
+ 	instrLenOrErr := self disassembleFor: cpu
+ 						At: address
+ 						In: memory
+ 						Size: (interpreterProxy byteSizeOf: memory cPtrAsOop).
+ 	instrLenOrErr < 0 ifTrue:
+ 		[^interpreterProxy primitiveFailFor: PrimErrInappropriate].
+ 	log := self getlog: (self cCode: [self addressOf: logLen] inSmalltalk: [logLen := 0]).
+ 	resultObj := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2.
+ 	resultObj = 0 ifTrue:
+ 		[^interpreterProxy primitiveFailFor: PrimErrNoMemory].
+ 
+ 	"Easier keeping the damn thing on the stack than using pushRemappableOop:/popRemappableOop.
+ 	 Where is topRemappableOop when you need it?"
+ 	interpreterProxy pushRemappableOop: resultObj.
+ 	logObj := interpreterProxy
+ 				instantiateClass: interpreterProxy classString
+ 				indexableSize: logLen.
+ 	interpreterProxy failed ifTrue:
+ 		[interpreterProxy popRemappableOop.
+ 		 ^interpreterProxy primitiveFailFor: PrimErrNoMemory].
+ 	logObjData := interpreterProxy arrayValueOf: logObj.
+ 	self mem: logObjData cp: log y: logLen.
+ 	resultObj := interpreterProxy popRemappableOop.
+ 	interpreterProxy
+ 		storePointer: 0
+ 		ofObject: resultObj
+ 		withValue: (interpreterProxy integerObjectOf: instrLenOrErr).
+ 	interpreterProxy storePointer: 1 ofObject: resultObj withValue: logObj.
+ 
+ 	^resultObj!

Item was added:
+ ----- Method: GdbARMPlugin>>primitiveDisassembleAt:InMemory: (in category 'primitives') -----
+ "cpuAlien <GdbARMAlien>" primitiveDisassembleAt: address "<Integer>" InMemory: memory "<Bitmap|ByteArray|WordArray>"
+ 	"Return an Array of the instruction length and its decompilation as a string for the instruction at address in memory."
+ 	| cpuAlien cpu instrLenOrErr resultObj log logLen logObj logObjData |
+ 	<var: #cpu type: #'void *'>
+ 	cpuAlien := self primitive: #primitiveDisassembleAtInMemory
+ 					parameters: #(Unsigned WordsOrBytes)
+ 					receiver: #Oop.
+ 	(cpu := self startOfData: cpuAlien) = 0 ifTrue:
+ 		[^interpreterProxy primitiveFailFor: PrimErrBadReceiver].
+ 	instrLenOrErr := self disassembleFor: cpu
+ 						At: address
+ 						In: memory
+ 						Size: (interpreterProxy byteSizeOf: memory cPtrAsOop).
+ 	instrLenOrErr < 0 ifTrue:
+ 		[^interpreterProxy primitiveFailFor: PrimErrInappropriate].
+ 	log := self getlog: (self cCode: [self addressOf: logLen] inSmalltalk: [logLen := 0]).
+ 	resultObj := interpreterProxy instantiateClass: interpreterProxy classArray indexableSize: 2.
+ 	resultObj = 0 ifTrue:
+ 		[^interpreterProxy primitiveFailFor: PrimErrNoMemory].
+ 
+ 	"Easier keeping the damn thing on the stack than using pushRemappableOop:/popRemappableOop.
+ 	 Where is topRemappableOop when you need it?"
+ 	interpreterProxy pushRemappableOop: resultObj.
+ 	logObj := interpreterProxy
+ 				instantiateClass: interpreterProxy classString
+ 				indexableSize: logLen.
+ 	interpreterProxy failed ifTrue:
+ 		[interpreterProxy popRemappableOop.
+ 		 ^interpreterProxy primitiveFailFor: PrimErrNoMemory].
+ 	logObjData := interpreterProxy arrayValueOf: logObj.
+ 	self mem: logObjData cp: log y: logLen.
+ 	resultObj := interpreterProxy popRemappableOop.
+ 	interpreterProxy
+ 		storePointer: 0
+ 		ofObject: resultObj
+ 		withValue: (interpreterProxy integerObjectOf: instrLenOrErr).
+ 	interpreterProxy storePointer: 1 ofObject: resultObj withValue: logObj.
+ 
+ 	^resultObj!