[Git][ghc/ghc][wip/andreask/interpreter_primops] Some fixes
Andreas Klebinger (@AndreasK)
gitlab at gitlab.haskell.org
Mon Feb 24 15:36:03 UTC 2025
Andreas Klebinger pushed to branch wip/andreask/interpreter_primops at Glasgow Haskell Compiler / GHC
Commits:
310a1790 by Andreas Klebinger at 2025-02-24T16:13:49+01:00
Some fixes
- - - - -
6 changed files:
- compiler/GHC/ByteCode/Asm.hs
- compiler/GHC/ByteCode/Instr.hs
- compiler/GHC/StgToByteCode.hs
- rts/Disassembler.c
- rts/Interpreter.c
- rts/include/rts/Bytecodes.h
Changes:
=====================================
compiler/GHC/ByteCode/Asm.hs
=====================================
@@ -554,10 +554,14 @@ assembleI platform i = case i of
OP_NEQ -> emit bci_OP_NEQ []
OP_EQ -> emit bci_OP_EQ []
- OP_LT -> emit bci_OP_LT []
- OP_GE -> emit bci_OP_GE []
- OP_GT -> emit bci_OP_GT []
- OP_LE -> emit bci_OP_LE []
+ OP_U_LT -> emit bci_OP_U_LT []
+ OP_S_LT -> emit bci_OP_S_LT []
+ OP_U_GE -> emit bci_OP_U_GE []
+ OP_S_GE -> emit bci_OP_S_GE []
+ OP_U_GT -> emit bci_OP_U_GT []
+ OP_S_GT -> emit bci_OP_S_GT []
+ OP_U_LE -> emit bci_OP_U_LE []
+ OP_S_LE -> emit bci_OP_S_LE []
OP_SIZED_SUB rep -> emit (sizedInstr platform bci_OP_SIZED_SUB rep) []
=====================================
compiler/GHC/ByteCode/Instr.hs
=====================================
@@ -231,10 +231,15 @@ data BCInstr
| OP_NEQ
| OP_EQ
- | OP_LT
- | OP_GE
- | OP_GT
- | OP_LE
+ | OP_U_LT
+ | OP_U_GE
+ | OP_U_GT
+ | OP_U_LE
+
+ | OP_S_LT
+ | OP_S_GE
+ | OP_S_GT
+ | OP_S_LE
| OP_SIZED_SUB PrimRep
@@ -432,10 +437,14 @@ instance Outputable BCInstr where
ppr OP_EQ = text "OP_EQ"
ppr OP_NEQ = text "OP_NEQ"
- ppr OP_LT = text "OP_LT"
- ppr OP_GE = text "OP_GE"
- ppr OP_GT = text "OP_GT"
- ppr OP_LE = text "OP_LE"
+ ppr OP_S_LT = text "OP_S_LT"
+ ppr OP_S_GE = text "OP_S_GE"
+ ppr OP_S_GT = text "OP_S_GT"
+ ppr OP_S_LE = text "OP_S_LE"
+ ppr OP_U_LT = text "OP_U_LT"
+ ppr OP_U_GE = text "OP_U_GE"
+ ppr OP_U_GT = text "OP_U_GT"
+ ppr OP_U_LE = text "OP_U_LE"
ppr (OP_SIZED_SUB rep) = text "OP_SIZED_SUB" <+> (ppr rep)
@@ -561,10 +570,14 @@ bciStackUse OP_LSR{} = 0
bciStackUse OP_NEQ{} = 0
bciStackUse OP_EQ{} = 0
-bciStackUse OP_LT{} = 0
-bciStackUse OP_GT{} = 0
-bciStackUse OP_LE{} = 0
-bciStackUse OP_GE{} = 0
+bciStackUse OP_S_LT{} = 0
+bciStackUse OP_S_GT{} = 0
+bciStackUse OP_S_LE{} = 0
+bciStackUse OP_S_GE{} = 0
+bciStackUse OP_U_LT{} = 0
+bciStackUse OP_U_GT{} = 0
+bciStackUse OP_U_LE{} = 0
+bciStackUse OP_U_GE{} = 0
bciStackUse OP_SIZED_SUB{} = 0
=====================================
compiler/GHC/StgToByteCode.hs
=====================================
@@ -849,12 +849,12 @@ doPrimOp op init_d s p args =
Int64SubOp -> primOp OP_SUB
Word64SubOp -> primOp OP_SUB
- Int8SubOp -> primOp (OP_SIZED_SUB primArg1Width)
- Word8SubOp -> primOp (OP_SIZED_SUB primArg1Width)
- Int16SubOp -> primOp (OP_SIZED_SUB primArg1Width)
- Word16SubOp -> primOp (OP_SIZED_SUB primArg1Width)
- Int32SubOp -> primOp (OP_SIZED_SUB primArg1Width)
- Word32SubOp -> primOp (OP_SIZED_SUB primArg1Width)
+ -- Int8SubOp -> primOp (OP_SIZED_SUB primArg1Width)
+ -- Word8SubOp -> primOp (OP_SIZED_SUB primArg1Width)
+ -- Int16SubOp -> primOp (OP_SIZED_SUB primArg1Width)
+ -- Word16SubOp -> primOp (OP_SIZED_SUB primArg1Width)
+ -- Int32SubOp -> primOp (OP_SIZED_SUB primArg1Width)
+ -- Word32SubOp -> primOp (OP_SIZED_SUB primArg1Width)
IntAndOp -> primOp OP_AND
WordAndOp -> primOp OP_AND
@@ -876,21 +876,21 @@ doPrimOp op init_d s p args =
WordEqOp -> primOp OP_EQ
Word64EqOp -> primOp OP_EQ
- IntLtOp -> primOp OP_LT
- WordLtOp -> primOp OP_LT
- Word64LtOp -> primOp OP_LT
+ IntLtOp -> primOp OP_S_LT
+ WordLtOp -> primOp OP_U_LT
+ Word64LtOp -> primOp OP_U_LT
- IntGeOp -> primOp OP_GE
- WordGeOp -> primOp OP_GE
- Word64GeOp -> primOp OP_GE
+ IntGeOp -> primOp OP_S_GE
+ WordGeOp -> primOp OP_U_GE
+ Word64GeOp -> primOp OP_U_GE
- IntGtOp -> primOp OP_GT
- WordGtOp -> primOp OP_GT
- Word64GtOp -> primOp OP_GT
+ IntGtOp -> primOp OP_S_GT
+ WordGtOp -> primOp OP_U_GT
+ Word64GtOp -> primOp OP_U_GT
- IntLeOp -> primOp OP_LE
- WordLeOp -> primOp OP_LE
- Word64LeOp -> primOp OP_LE
+ IntLeOp -> primOp OP_S_LE
+ WordLeOp -> primOp OP_U_LE
+ Word64LeOp -> primOp OP_U_LE
IntNegOp -> primOp OP_NEG
Int64NegOp -> primOp OP_NEG
=====================================
rts/Disassembler.c
=====================================
@@ -498,17 +498,30 @@ disInstr ( StgBCO *bco, int pc )
debugBelch("OP_EQ\n");
break;
- case bci_OP_GT:
- debugBelch("OP_GT\n");
+ case bci_OP_U_GT:
+ debugBelch("OP_U_GT\n");
break;
- case bci_OP_LE:
- debugBelch("OP_LE\n");
+ case bci_OP_U_LE:
+ debugBelch("OP_U_LE\n");
break;
- case bci_OP_GE:
- debugBelch("OP_GE\n");
+ case bci_OP_U_GE:
+ debugBelch("OP_U_GE\n");
break;
- case bci_OP_LT:
- debugBelch("OP_LT\n");
+ case bci_OP_U_LT:
+ debugBelch("OP_U_LT\n");
+ break;
+
+ case bci_OP_S_GT:
+ debugBelch("OP_S_GT\n");
+ break;
+ case bci_OP_S_LE:
+ debugBelch("OP_S_LE\n");
+ break;
+ case bci_OP_S_GE:
+ debugBelch("OP_S_GE\n");
+ break;
+ case bci_OP_S_LT:
+ debugBelch("OP_S_LT\n");
break;
case bci_OP_SIZED_SUB:
=====================================
rts/Interpreter.c
=====================================
@@ -2155,12 +2155,19 @@ run_BCO:
#define SIZED_BIN_OP(op,ty) \
{ \
- ty r = (*(ty*) Sp_plusB(0)) - (*(ty*) Sp_plusB(sizeof(ty))); \
- /* If the two arguments didn't fit in a single word we have to clean up the stack.*/ \
+ ty r = (*(ty*) Sp_plusB(0)) op (*(ty*) Sp_plusB(sizeof(ty))); \
+ /* If the two arguments didn't fit in a single (host) word we have to clean up the stack.*/ \
if(sizeof(ty)*2 > sizeof(StgWord)) { \
- Sp_addW(sizeof(ty)*2/sizeof(StgWord) - 1); /*One word accounts for result*/ \
- } \
- SpW(0) = (StgWord) r; \
+ /* Invariant: Multiple of word size pushed. \
+ Variations: 2x32bit on 32bit, 2x64 on 32bit, 2x64 on 64bit*/ \
+ Sp_addB(sizeof(ty)*2 - sizeof(ty)); \
+ }; \
+ /* Host might be 32bit, so ensure we write as MAX(Word/Word64) */ \
+ if(sizeof(ty) == 8) { \
+ SpW64(0) = (StgWord64) r; \
+ } else { \
+ SpW(0) = (StgWord) r; \
+ }; \
goto nextInsn; \
}
@@ -2177,12 +2184,18 @@ run_BCO:
case bci_OP_LSR: BIN_WORD64_OP(>>)
case bci_OP_ASR: BIN_INT64_OP(>>)
- case bci_OP_NEQ: BIN_INT64_OP(!=)
- case bci_OP_EQ: BIN_INT64_OP(!=)
- case bci_OP_GT: BIN_INT64_OP(>)
- case bci_OP_GE: BIN_INT64_OP(>=)
- case bci_OP_LT: BIN_INT64_OP(<)
- case bci_OP_LE: BIN_INT64_OP(<=)
+ case bci_OP_NEQ: BIN_INT64_OP(!=)
+ case bci_OP_EQ: BIN_INT64_OP(!=)
+ case bci_OP_U_GT: BIN_WORD64_OP(>)
+ case bci_OP_U_GE: BIN_WORD64_OP(>=)
+ case bci_OP_U_LT: BIN_WORD64_OP(<)
+ case bci_OP_U_LE: BIN_WORD64_OP(<=)
+
+ case bci_OP_S_GT: BIN_INT64_OP(>)
+ case bci_OP_S_GE: BIN_INT64_OP(>=)
+ case bci_OP_S_LT: BIN_INT64_OP(<)
+ case bci_OP_S_LE: BIN_INT64_OP(<=)
+
case bci_OP_NOT: UN_INT64_OP(~)
case bci_OP_NEG: UN_INT64_OP(-)
=====================================
rts/include/rts/Bytecodes.h
=====================================
@@ -127,10 +127,14 @@
#define bci_OP_NEQ 110
#define bci_OP_EQ 111
-#define bci_OP_GE 112
-#define bci_OP_GT 113
-#define bci_OP_LT 114
-#define bci_OP_LE 115
+#define bci_OP_U_GE 112
+#define bci_OP_U_GT 113
+#define bci_OP_U_LT 114
+#define bci_OP_U_LE 115
+#define bci_OP_S_GE 116
+#define bci_OP_S_GT 117
+#define bci_OP_S_LT 118
+#define bci_OP_S_LE 119
#define bci_OP_SIZED_SUB 130
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/310a17908d0177b995d52cd8d64d35a37593fa82
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/310a17908d0177b995d52cd8d64d35a37593fa82
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250224/dbaed909/attachment-0001.html>
More information about the ghc-commits
mailing list