[Vm-dev] VM Maker: Cog-eem.285.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.285.mcz

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

Name: Cog-eem.285
Author: eem
Time: 4 October 2015, 9:55:41.759 am
UUID: 4d3d05af-311f-494b-bbc5-4ce5db1fa6f6
Ancestors: Cog-eem.284

Decode VarBaseReg-relative refs in x86 assembly decoration.

=============== Diff against Cog-eem.284 ===============

Item was changed:
  ----- Method: BochsX64Alien>>decorateDisassembly:for: (in category 'disassembly') -----
  decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>"
+ 	| string i1 i2 v extra |
- 	| string i1 i2 v |
  	string := anInstructionString.
+ 	((i1 := string indexOfSubCollection: '%ds:(') > 0
+ 	or: [(i1 := string indexOfSubCollection: '%ss:(') > 0]) ifTrue:
+ 		[string := string copyReplaceFrom: i1 to: i1 + 3 with: ''].
  	(i1 := string indexOfSubCollection: '%ds:0x') > 0 ifTrue:
  		[i2 := i1 + 6.
  		 ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1].
+ 		 (string copyFrom: i2 to: (i2 + 5 min: string size)) = '(%rbx)' ifTrue:
+ 			[v := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16.
+ 		 	 (aSymbolManager lookupAddress: aSymbolManager varBaseAddress + v) ifNotNil:
+ 				[:varName| extra := ' = ', varName]].
  		 string := string
+ 					copyReplaceFrom: i1
- 					copyReplaceFrom: i1 + 4
  					to: i2 - 1
  					with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 4 to: i2 - 1))].
  	(i1 := string indexOfSubCollection: '%ss:0x') > 0 ifTrue:
  		[i2 := i1 + 6.
  		 ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1].
  		 ((string at: i2) = $(
  		 and: [(string at: i2 + 1) = $%]) ifTrue:
  			[v := Integer readFrom: (ReadStream on: string from: i1 + 6 to: i2 - 1) base: 16.
  			string := string
  						copyReplaceFrom: i1
  						to: i2 - 1
  						with: ((v bitAnd: (1 bitShift: 31) - 1) - (v bitAnd: (1 bitShift: 31))) printString]].
  	(i1 := string indexOfSubCollection: '$0x') > 0 ifTrue:
  		[i2 := i1 + 3.
  		 ['0123456789abcdef' includes: (string at: i2)] whileTrue: [i2 := i2 + 1].
  		 string := string
  					copyReplaceFrom: i1 + 1
  					to: i2 - 1
  					with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))].
  	((i1 := string indexOf: $() > 1
  	 and: [(string at: i1 + 1) isDigit
  	 and: [i1 < (i2 := string indexOf: $))]]) ifTrue:
  		[string := string
  					copyReplaceFrom: i1 + 1
  					to: i2 - 1
  					with: (aSymbolManager lookupCHexString: (string copyFrom: i1 + 1 to: i2 - 1))].
+ 	^extra
+ 		ifNil: [string]
+ 		ifNotNil: [i1 := string lastIndexOf: $:. string copyReplaceFrom: i1 - 1 to: i1 - 2 with: extra]!
- 	^string!