RISC-V: refactor ?load evaluators

...to use common helper.
janvrany · Nov 29, 2023 · cccdb3a · cccdb3a
1 parent 75f0703
commit cccdb3a
Showing 1 changed file with 40 additions and 13 deletions.
diff --git a/src/Tinyrossa-RISCV/TRRV64GCodeEvaluator.class.st b/src/Tinyrossa-RISCV/TRRV64GCodeEvaluator.class.st
@@ -41,6 +41,33 @@ TRRV64GCodeEvaluator >> commonBin: node opcodeR: opR opcodeI: opI [
  ^ dstReg
 ]
 
+{ #category : #'evaluation-helpers' }
+TRRV64GCodeEvaluator >> commonLoad: node [
+ "Handles aload, lload, iload, sload & bload" 
+
+ | dstReg offset type |
+
+ offset := (AcDSLSymbol value: node symbol name).
+ dstReg := codegen allocateRegister.
+
+ type := node type.
+ (type == Address or:[type == Int64]) ifTrue:[
+ generate
+ ld: dstReg, (sp + offset).
+ ] ifFalse:[ type == Int32 ifTrue:[
+ generate
+ lw: dstReg, (sp + offset). 
+ ] ifFalse:[ type == Int16 ifTrue:[
+ generate
+ lh: dstReg, (sp + offset). 
+ ] ifFalse:[ type == Int8 ifTrue:[
+ generate
+ lb: dstReg, (sp + offset). 
+ ]]]].
+
+ ^dstReg.
+]
+
 { #category : #'evaluation-helpers' }
 TRRV64GCodeEvaluator >> commonMul: node [
  "Handles imul and lmul"
@@ -252,7 +279,7 @@ TRRV64GCodeEvaluator >> evaluate_aladd: node [
 
 { #category : #evaluation }
 TRRV64GCodeEvaluator >> evaluate_aload: node [
- ^ self evaluate_lload: node
+ ^ self commonLoad: node
 ]
 
 { #category : #evaluation }
@@ -270,6 +297,11 @@ TRRV64GCodeEvaluator >> evaluate_bconst: node [
  ^ self evaluate_iconst: node
 ]
 
+{ #category : #evaluation }
+TRRV64GCodeEvaluator >> evaluate_bload: node [
+ ^ self commonLoad: node
+]
+
 { #category : #evaluation }
 TRRV64GCodeEvaluator >> evaluate_bloadi: node [
  ^ self evaluate_Xloadi: node
@@ -495,12 +527,7 @@ TRRV64GCodeEvaluator >> evaluate_iflcmpne: node [
 
 { #category : #evaluation }
 TRRV64GCodeEvaluator >> evaluate_iload: node [
- | symbol dstReg |
-
- symbol := node symbol.
- dstReg := codegen allocateRegister.
- generate lw: dstReg, (sp + (AcDSLSymbol value: symbol name)).
- ^ dstReg
+ ^ self commonLoad: node
 ]
 
 { #category : #evaluation }
@@ -583,12 +610,7 @@ TRRV64GCodeEvaluator >> evaluate_lconst: node [
 
 { #category : #evaluation }
 TRRV64GCodeEvaluator >> evaluate_lload: node [
- | symbol dstReg |
-
- symbol := node symbol.
- dstReg := codegen allocateRegister.
- generate ld: dstReg, (sp + (AcDSLSymbol value: symbol name)).
- ^ dstReg
+ ^ self commonLoad: node
 ]
 
 { #category : #evaluation }
@@ -689,6 +711,11 @@ TRRV64GCodeEvaluator >> evaluate_sconst: node [
  ^ self evaluate_iconst: node
 ]
 
+{ #category : #evaluation }
+TRRV64GCodeEvaluator >> evaluate_sload: node [
+ ^ self commonLoad: node
+]
+
 { #category : #evaluation }
 TRRV64GCodeEvaluator >> evaluate_sloadi: node [
  ^ self evaluate_Xloadi: node