Merge pull request #20 from janvrany/pr/misc-improvements-V

Misc improvements and bug fixes IV
janvrany · Jun 17, 2023 · 1782398 · 1782398
2 parents f6590e8 + 8d8a75a
commit 1782398
Show file tree

Hide file tree

Showing 36 changed files with 4,187 additions and 3,922 deletions.
diff --git a/opcodesgen/opcodesgen.m4 b/opcodesgen/opcodesgen.m4
@@ -154,7 +154,7 @@ OPCODE_NAME($1): arguments
     ^ self build: OPCODE_NAME($1) arguments: arguments
 !
 ])
-!TRILBuilder methodsFor:'building'!
+!TRILBuilderBase methodsFor:'building'!
 include(opcodes.m4)
 !
 undefine([OPCODE_MACRO])

diff --git a/src/Tinyrossa-POWER/TRPPC64RegisterKinds.class.st b/src/Tinyrossa-POWER/TRPPC64RegisterKinds.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #TRPPC64RegisterKinds,
-	#superclass : #SharedPool,
+	#superclass : #TRSharedPool,
 	#classVars : [
 		'GPR',
 		'FPR',

diff --git a/src/Tinyrossa-POWER/TRPPC64Registers.class.st b/src/Tinyrossa-POWER/TRPPC64Registers.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #TRPPC64Registers,
-	#superclass : #SharedPool,
+	#superclass : #TRSharedPool,
 	#classVars : [
 		'cr0',
 		'cr1',

diff --git a/src/Tinyrossa-RISCV/TRRV64GRegisters.class.st b/src/Tinyrossa-RISCV/TRRV64GRegisters.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #TRRV64GRegisters,
-	#superclass : #SharedPool,
+	#superclass : #TRSharedPool,
 	#classVars : [
 		'zero',
 		'ra',

diff --git a/src/Tinyrossa/TRCFG.class.st b/src/Tinyrossa/TRCFG.class.st
@@ -41,7 +41,7 @@ TRCFG >> addBlockNamed: aStringOrNil [
 
 	block := TRILBlock forCFG: self named: name.
 	blocks add: block.
-	entry isNil ifTrue:[entry := block].
+	entry isNil ifTrue:[self entry: block].
 
 	^ block
 ]
@@ -59,6 +59,18 @@ TRCFG >> entry [
 	^ entry
 ]
 
+{ #category : #accessing }
+TRCFG >> entry: aTRILBlock [
+	"Set the entry block. 
+	
+	 Please note that entry block is set automatically when first block
+	 is allocated. This method is for internal use in cases one need
+	 modify entry block after TRIL is generated (for example, CFG simplifier
+	 removing empty entry block)."
+
+	entry := aTRILBlock
+]
+
 { #category : #initialization }
 TRCFG >> initializeWithCompilation: aTRCompilation [
 	compilation := aTRCompilation.

diff --git a/src/Tinyrossa/TRCFGSimplifier.class.st b/src/Tinyrossa/TRCFGSimplifier.class.st
@@ -58,11 +58,11 @@ TRCFGSimplifier >> simplify [
 			modified := true.
 		].
 
-		(self tryRemove: block) ifTrue: [ 
+		(self tryCombine: block) ifTrue: [ 
 			modified := true.
 		].
 
-		(self tryCombine: block) ifTrue: [ 
+		(self tryRemove: block) ifTrue: [ 
 			modified := true.
 		].
 
@@ -185,6 +185,17 @@ TRCFGSimplifier >> tryRemove: block [
 		block precedessors do: [:precedessor |
 			self relink: block to: block successor1 in: precedessor
 		].
+
+		"Handle the case we're removing (empty) entry block. 
+		 In this case we have to set CFG's entry block to
+		 successor1 - but only if there's one, otherwise we'd
+		 make CFG with no entry block which is illegal!"
+		block == compilation cfg entry ifTrue:[
+			block successor1	 notNil ifTrue:[
+				compilation cfg entry: block successor1
+			]
+		].
+
 		^ true.
 	].
 	^ false.

diff --git a/src/Tinyrossa/TRCodeEvaluator.class.st b/src/Tinyrossa/TRCodeEvaluator.class.st
@@ -66,20 +66,6 @@ TRCodeEvaluator >> evaluate_bbend: node [
 TRCodeEvaluator >> evaluate_bbstart: node [
 	| label |
 
-	node block isExtension ifFalse: [ 
-		| automatics parameters |
-
-		automatics := codegen compilation symbolManager lookupSymbolsByType: TRAutomaticSymbol.
-		automatics do: [:automatic | 
-			automatic setRegister: nil.
-		].
-
-		parameters := codegen compilation symbolManager lookupSymbolsByType: TRParameterSymbol.
-		parameters do: [:parameter | 
-			parameter setRegister: nil.
-		].            
-	].
-
 	label := self compilation symbolManager lookupLabelByBlock: node block.
 	(label notNil and: [label isUsed]) ifTrue: [
 		generate label: label name.

diff --git a/src/Tinyrossa/TRCompilationConfigOptions.class.st b/src/Tinyrossa/TRCompilationConfigOptions.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #TRCompilationConfigOptions,
-	#superclass : #SharedPool,
+	#superclass : #TRSharedPool,
 	#classVars : [
 		'OptionAOT',
 		'OptionLinkage',

diff --git a/src/Tinyrossa/TRCompilationExamples.class.st b/src/Tinyrossa/TRCompilationExamples.class.st
@@ -526,6 +526,30 @@ TRCompilationExamples >> example09_signum_2 [
 	compilation codeBuffer. "Only convenience inspection."
 ]
 
+{ #category : #examples }
+TRCompilationExamples >> example12_call_external_function [
+	| builder |
+
+	builder := compilation builder.
+	builder defineName: 'caller' type: Int32.
+
+	"Here we define function named 'callee' returning Int32
+	 at address 0xCAFECAFECAFECAFE."
+	(builder defineFunction: 'callee' type: Int32) 
+		setAddress: 16r000000007AFECAFE.
+
+	builder ireturn: 
+		{ builder icall: 
+			{ 'callee' } }.
+
+
+	compilation optimize.
+
+	compilation compile.
+
+	compilation codeBuffer. "Only convenience inspection."
+]
+
 { #category : #running }
 TRCompilationExamples >> setUp [
 	super setUp.

diff --git a/src/Tinyrossa/TRDataType.class.st b/src/Tinyrossa/TRDataType.class.st
@@ -1,6 +1,9 @@
 Class {
 	#name : #TRDataType,
 	#superclass : #Object,
+	#pools : [
+		'TRILOpcodeTables'
+	],
 	#category : #'Tinyrossa-Datatypes'
 }
 
@@ -20,6 +23,60 @@ TRDataType class >> named: aString [
 	"
 ]
 
+{ #category : #queries }
+TRDataType >> arithmeticOpcodeFor: arithmeticOpFlag [
+	"Return opcode for peforming arithmetic operation on two values 
+	 of receiver's type. 
+	 `arithmeticOpFlag` specifies the kind of operation wanted as 
+	 one of `Add`, `Sub`, `Mul`. `Div` or `Rem`  (see pool `TRILOpcodeProps1`).
+	"        
+	^ (ArithmeticOpcodes at: self) 
+		at: arithmeticOpFlag ifAbsent: [ self error:'No opcode for requested arithmetic operation' ]  
+
+	"
+	Add                  := 16r00000008.
+	Sub                  := 16r00000010.
+	Mul                  := 16r00000020.
+	Div                  := 16r00000040.
+	Rem                  := 16r00000080.
+	(TRDataType named: 'Int32') arithmeticOpcodeFor: 16r00000020
+	(TRDataType named: 'Address') compareOpcodeFor: 16r00000008.
+	(TRDataType named: 'Void') compareOpcodeFor: 16r00000008.
+	"
+]
+
+{ #category : #queries }
+TRDataType >> compareOpcodeFor: compareFlags [
+	"Return opcode for comparing two values of receiver's type.
+	 `compareFlags` specify the kind of comparison wanted as
+	 bit mask of `CompareTrueIfEqual`, `CompareTrueIfGreater`,  `CompareTrueIfLess`
+	 or: `CompareTrueIfUnordered` (see pool `TRILOpcodeProps3`).
+	"        
+	^ (CompareOpcodes at: self) 
+		at: compareFlags ifAbsent: [ self error:'No opcode for requested comparison' ]
+
+	"
+
+	CompareTrueIfLess           := 16r00000100. 
+	CompareTrueIfGreater        := 16r00000200. 
+	CompareTrueIfEqual          := 16r00000400. 
+	CompareTrueIfUnordered      := 16r00000800. 
+	(TRDataType named: 'Int32') compareOpcodeFor: 16r00000100 | 16r00000400.
+	(TRDataType named: 'Address') compareOpcodeFor: 16r00000100.
+	(TRDataType named: 'Void') compareOpcodeFor: 16r00000100.
+	"
+]
+
+{ #category : #queries }
+TRDataType >> constOpcode [
+	"Return opcode that can be used to load a constant of receiver's type"
+	^ ConstOpcodes at: self
+
+	"
+	(TRDataType named:'Float') constOpcode
+	"
+]
+
 { #category : #testing }
 TRDataType >> isCompatibleWith: anotherType [
 	self assert: (anotherType isKindOf: TRDataType).
@@ -47,11 +104,10 @@ TRDataType >> isVoidType [
 
 { #category : #queries }
 TRDataType >> loadOpcode [
-	^ self subclassResponsibility
+	^ LoadOpcodes at: self
 
 	"
 	(TRDataType named:'Int32') loadOpcode
-	TRILOpcodes initialize
 	"
 ]
 
@@ -70,7 +126,7 @@ TRDataType >> printOn:aStream [
 
 { #category : #queries }
 TRDataType >> storeOpcode [
-	^ self subclassResponsibility
+	^ StoreOpcodes at: self           
 
 	"
 	(TRDataType named:'Int32') storeOpcode

diff --git a/src/Tinyrossa/TRDataTypeAddress.class.st b/src/Tinyrossa/TRDataTypeAddress.class.st
@@ -12,21 +12,11 @@ TRDataTypeAddress >> isIntegerType [
 	^ true
 ]
 
-{ #category : #queries }
-TRDataTypeAddress >> loadOpcode [
-	^ aload
-]
-
 { #category : #accessing }
 TRDataTypeAddress >> name [
 	^ 'Address'
 ]
 
-{ #category : #queries }
-TRDataTypeAddress >> storeOpcode [
-	^ astore
-]
-
 { #category : #validation }
 TRDataTypeAddress >> validateConstant: aNumber [
 	"  TODO: care for 32bit archs somehow"

diff --git a/src/Tinyrossa/TRDataTypeDouble.class.st b/src/Tinyrossa/TRDataTypeDouble.class.st
@@ -12,21 +12,11 @@ TRDataTypeDouble >> isFloatingPointType [
 	^ true
 ]
 
-{ #category : #queries }
-TRDataTypeDouble >> loadOpcode [
-	^ dload
-]
-
 { #category : #accessing }
 TRDataTypeDouble >> name [
    ^ 'Double'
 ]
 
-{ #category : #queries }
-TRDataTypeDouble >> storeOpcode [
-	^ dstore
-]
-
 { #category : #validation }
 TRDataTypeDouble >> validateConstant: aNumber [
    self assert: aNumber isFloat

diff --git a/src/Tinyrossa/TRDataTypeFloat.class.st b/src/Tinyrossa/TRDataTypeFloat.class.st
@@ -12,21 +12,11 @@ TRDataTypeFloat >> isFloatingPointType [
 	^ true
 ]
 
-{ #category : #queries }
-TRDataTypeFloat >> loadOpcode [
-	^ fload
-]
-
 { #category : #accessing }
 TRDataTypeFloat >> name [
 	^ 'Float'
 ]
 
-{ #category : #queries }
-TRDataTypeFloat >> storeOpcode [
-	^ fstore
-]
-
 { #category : #validation }
 TRDataTypeFloat >> validateConstant: aNumber [
 	self assert: aNumber isFloat

diff --git a/src/Tinyrossa/TRDataTypeInt16.class.st b/src/Tinyrossa/TRDataTypeInt16.class.st
@@ -12,21 +12,11 @@ TRDataTypeInt16 >> isIntegerType [
 	^ true
 ]
 
-{ #category : #queries }
-TRDataTypeInt16 >> loadOpcode [
-	^ sload
-]
-
 { #category : #accessing }
 TRDataTypeInt16 >> name [
 	^ 'Int16'
 ]
 
-{ #category : #queries }
-TRDataTypeInt16 >> storeOpcode [
-	^ sstore
-]
-
 { #category : #validation }
 TRDataTypeInt16 >> validateConstant: aNumber [
 	self assert: (aNumber between: -16r8000 and: 16r7FFF) description: 'Invalid constant'

diff --git a/src/Tinyrossa/TRDataTypeInt32.class.st b/src/Tinyrossa/TRDataTypeInt32.class.st
@@ -12,21 +12,11 @@ TRDataTypeInt32 >> isIntegerType [
 	^ true
 ]
 
-{ #category : #queries }
-TRDataTypeInt32 >> loadOpcode [
-	^ iload
-]
-
 { #category : #accessing }
 TRDataTypeInt32 >> name [
    ^ 'Int32'
 ]
 
-{ #category : #queries }
-TRDataTypeInt32 >> storeOpcode [
-	^ istore
-]
-
 { #category : #validation }
 TRDataTypeInt32 >> validateConstant: aNumber [
 	self assert: (aNumber between: -16r80000000 and: 16r7FFFFFFF) description: 'Invalid constant'

diff --git a/src/Tinyrossa/TRDataTypeInt64.class.st b/src/Tinyrossa/TRDataTypeInt64.class.st
@@ -12,21 +12,11 @@ TRDataTypeInt64 >> isIntegerType [
 	^ true
 ]
 
-{ #category : #queries }
-TRDataTypeInt64 >> loadOpcode [
-	^ lload
-]
-
 { #category : #accessing }
 TRDataTypeInt64 >> name [
 	^ 'Int64'
 ]
 
-{ #category : #queries }
-TRDataTypeInt64 >> storeOpcode [
-	^ lstore
-]
-
 { #category : #validation }
 TRDataTypeInt64 >> validateConstant: aNumber [
 	self assert: (aNumber between: -16r8000000000000000 and: 16r7FFFFFFFFFFFFFFF) description: 'Invalid constant'

diff --git a/src/Tinyrossa/TRDataTypeInt8.class.st b/src/Tinyrossa/TRDataTypeInt8.class.st
@@ -12,21 +12,11 @@ TRDataTypeInt8 >> isIntegerType [
 	^ true
 ]
 
-{ #category : #queries }
-TRDataTypeInt8 >> loadOpcode [
-	^ bload
-]
-
 { #category : #accessing }
 TRDataTypeInt8 >> name [
    ^ 'Int8'
 ]
 
-{ #category : #queries }
-TRDataTypeInt8 >> storeOpcode [
-	^ bstore
-]
-
 { #category : #validation }
 TRDataTypeInt8 >> validateConstant: aNumber [
 	self assert: (aNumber between: -16r80 and: 16r7F) description: 'Invalid constant'