DSL: rename AcDSLCodeBuffer to AcDSLCodeObject

The latter - `AcDSLCodeObject` - seems to be a better name of what this
really is (or will become in subsequent commit) as it's more like an
"object file" (or "object code") than mere memory buffer containing
instructions. It has base address, (will) contains relocations, debug
info and what not so...

Author: janvrany

src/ArchC-DSL/AcDSLAssembler.class.st

@@ -2,7 +2,7 @@ Class {
 	#name : #AcDSLAssembler,
 	#superclass : #Object,
 	#instVars : [
-		'memory',
+		'object',
 		'cursor',
 		'annotations'
 	],
@@ -59,7 +59,7 @@ AcDSLAssembler >> annotations: aCollection [
 { #category : #'emitting-private' }
 AcDSLAssembler >> append: insn [
 	insn annotations: annotations.
-	memory instructions add: insn afterIndex: cursor.
+	object instructions add: insn afterIndex: cursor.
 	cursor := cursor + 1.
 	^ insn
 ]
@@ -95,34 +95,32 @@ AcDSLAssembler >> byte: bytes [
 { #category : #accessing }
 AcDSLAssembler >> cursor: anInteger [
 	self assert: anInteger isInteger.
-	self assert:(anInteger between: 0 and: memory instructions size).
+	self assert:(anInteger between: 0 and: object instructions size).
 
 	cursor := anInteger
 ]
 
 { #category : #inspecting }
 AcDSLAssembler >> gtInspectorInstructionsIn: composite [
 	<gtInspectorPresentationOrder: 60>
-	^memory gtInspectorInstructionsIn: composite
-
+	^object gtInspectorInstructionsIn: composite
 ]
 
 { #category : #initialization }
 AcDSLAssembler >> initialize [
 	super initialize.
-
-	"Lazy-generate DSL methods here upon first instantiation.
-	 This solves three problems: 
-	   (i) spares users to think of it and doing it manually
-	   (ii) avoids generating assemblers which will never be used.
-	   (iii) makes it debuggable if there's an error since this will
-		 be called once all the code is loaded (as opposed to 'at some
-		 undefined time during package loading').
+	 "Lazy-generate DSL methods here upon first instantiation.
+	 This solves three problems:
+	 (i) spares users to think of it and doing it manually
+	 (ii) avoids generating assemblers which will never be used.
+	 (iii) makes it debuggable if there's an error since this will
+	 be called once all the code is loaded (as opposed to 'at some
+	 undefined time during package loading').
 	"
-	self class generated ifFalse: [ 
+	self class generated ifFalse: [
 		AcDSLAssemblerGenerator generate: self class.
 	].
-	memory := AcDSLCodeBuffer new.
+	object := AcDSLCodeObject new.
 	cursor := 0.
 ]
 
@@ -157,5 +155,15 @@ AcDSLAssembler >> label: anObject [
 
 { #category : #accessing }
 AcDSLAssembler >> memory [
-	^ memory
+	<resource: #obsolete>
+
+	^self object
+]
+
+{ #category : #accessing }
+AcDSLAssembler >> object [
+	"Return the code object containing the code generated
+	 by this assembler."
+
+	^ object
 ]

src/ArchC-DSL/AcDSLCodeBuffer.class.st src/ArchC-DSL/AcDSLCodeObject.class.st

@@ -1,5 +1,5 @@
 Class {
-	#name : #AcDSLCodeBuffer,
+	#name : #AcDSLCodeObject,
 	#superclass : #Object,
 	#instVars : [
 		'address',
@@ -9,25 +9,25 @@ Class {
 }
 
 { #category : #'instance creation' }
-AcDSLCodeBuffer class >> new [
+AcDSLCodeObject class >> new [
 	"return an initialized instance"
 
 	^ self basicNew initialize.
 
 ]
 
 { #category : #accessing }
-AcDSLCodeBuffer >> address [
+AcDSLCodeObject >> address [
 	^ address
 ]
 
 { #category : #accessing }
-AcDSLCodeBuffer >> bytes [
+AcDSLCodeObject >> bytes [
 	^ ByteArray streamContents: [ :s | instructions do: [:i | i emitOn: s ] ]
 ]
 
 { #category : #utilities }
-AcDSLCodeBuffer >> disassembleOn: aStream [
+AcDSLCodeObject >> disassembleOn: aStream [
 	| pc |
 
 	pc := address.
@@ -45,12 +45,12 @@ AcDSLCodeBuffer >> disassembleOn: aStream [
 ]
 
 { #category : #utilities }
-AcDSLCodeBuffer >> disassembled [
+AcDSLCodeObject >> disassembled [
 	^ String streamContents: [ :s | self disassembleOn: s. ].
 ]
 
 { #category : #relocation }
-AcDSLCodeBuffer >> fixupBranchTargets [
+AcDSLCodeObject >> fixupBranchTargets [
 	| locations insnAddr |
 
 	"Pass 1 - collect all labels and their (relative) addresses:"
@@ -69,7 +69,7 @@ AcDSLCodeBuffer >> fixupBranchTargets [
 ]
 
 { #category : #relocation }
-AcDSLCodeBuffer >> fixupBranchTargetsUsing: locations [
+AcDSLCodeObject >> fixupBranchTargetsUsing: locations [
 	| insnAddr |
 
 	insnAddr := address.
@@ -92,7 +92,7 @@ AcDSLCodeBuffer >> fixupBranchTargetsUsing: locations [
 ]
 
 { #category : #inspecting }
-AcDSLCodeBuffer >> gtInspectorInstructionsIn: composite [
+AcDSLCodeObject >> gtInspectorInstructionsIn: composite [
 	<gtInspectorPresentationOrder: 60>
 
 	^ composite fastTable
@@ -128,23 +128,23 @@ AcDSLCodeBuffer >> gtInspectorInstructionsIn: composite [
 ]
 
 { #category : #initialization }
-AcDSLCodeBuffer >> initialize [
+AcDSLCodeObject >> initialize [
 	address := 0.
 	instructions := OrderedCollection new.
 ]
 
 { #category : #accessing }
-AcDSLCodeBuffer >> instructions [
+AcDSLCodeObject >> instructions [
 	^ instructions
 ]
 
 { #category : #relocation }
-AcDSLCodeBuffer >> relocateTo: newAddress with: ignored [
+AcDSLCodeObject >> relocateTo: newAddress with: ignored [
 	address := newAddress.
 ]
 
 { #category : #accessing }
-AcDSLCodeBuffer >> relocations [
+AcDSLCodeObject >> relocations [
 	| addr relocs |
 
 	addr := address.
@@ -158,3 +158,10 @@ AcDSLCodeBuffer >> relocations [
 	].
 	^ relocs
 ]
+
+{ #category : #accessing }
+AcDSLCodeObject >> size [
+	"Return the size of code in bytes"
+
+	^ instructions inject: 0 into: [:size :insn | size + (insn bitWidth // 8) ]
+]