Replacing $ operator with more readable |> operator
This commit is contained in:
parent
2b1c486c17
commit
0792bf3c7d
12 changed files with 122 additions and 101 deletions
107
hs/Decode.hs
107
hs/Decode.hs
|
|
@ -12,6 +12,7 @@ import Clash.Prelude
|
|||
import Fetch(FetchResult (Instruction, InstructionException))
|
||||
import Exceptions(Exception(..))
|
||||
import Types(Insn)
|
||||
import Util((|>))
|
||||
|
||||
data DecodeResult = Opcode Opcode
|
||||
| DecodeException Exception
|
||||
|
|
@ -19,11 +20,11 @@ data DecodeResult = Opcode Opcode
|
|||
deriving (Generic, Show, Eq, NFDataX)
|
||||
|
||||
decode :: FetchResult -> DecodeResult
|
||||
decode (Instruction insn) =
|
||||
decode (Instruction insn) =
|
||||
case insnToOpcode insn of
|
||||
Just opcode -> Opcode opcode
|
||||
Nothing -> DecodeException $ IllegalInstruction insn
|
||||
decode (Fetch.InstructionException exception) =
|
||||
Nothing -> DecodeException |> IllegalInstruction insn
|
||||
decode (Fetch.InstructionException exception) =
|
||||
Decode.InstructionException exception
|
||||
|
||||
insnToOpcode :: Insn -> Maybe Opcode
|
||||
|
|
@ -46,19 +47,19 @@ decodeRType insn =
|
|||
0b0110011 ->
|
||||
case funct3 of
|
||||
0x00 -> case funct7 of
|
||||
0x00 -> Just $ ADD (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x20 -> Just $ SUB (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x00 -> Just |> ADD (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x20 -> Just |> SUB (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
_ -> Nothing
|
||||
0x04 -> Just $ XOR (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x06 -> Just $ OR (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x07 -> Just $ AND (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x01 -> Just $ SLL (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x04 -> Just |> XOR (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x06 -> Just |> OR (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x07 -> Just |> AND (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x01 -> Just |> SLL (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x05 -> case funct7 of
|
||||
0x00 -> Just $ SRL (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x20 -> Just $ SRA (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x00 -> Just |> SRL (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x20 -> Just |> SRA (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
_ -> Nothing
|
||||
0x02 -> Just $ SLT (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x03 -> Just $ SLTU (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x02 -> Just |> SLT (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
0x03 -> Just |> SLTU (RTypeFields opcode rd funct3 rs1 rs2 funct7)
|
||||
_ -> Nothing
|
||||
_ -> Nothing
|
||||
where
|
||||
|
|
@ -72,36 +73,36 @@ decodeRType insn =
|
|||
decodeIType :: Insn -> Maybe Opcode
|
||||
decodeIType insn = case opcode of
|
||||
0b0010011 -> case funct3 of
|
||||
0x0 -> Just $ ADDI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x4 -> Just $ XORI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x6 -> Just $ ORI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x7 -> Just $ ANDI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x0 -> Just |> ADDI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x4 -> Just |> XORI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x6 -> Just |> ORI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x7 -> Just |> ANDI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x1 -> if slice d31 d25 (pack insn) == 0
|
||||
then Just $ SLLI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
then Just |> SLLI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
else Nothing
|
||||
0x5 -> case slice d31 d25 (pack insn) of -- Distinguish SRLI and SRAI
|
||||
0x00 -> Just $ SRLI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x20 -> Just $ SRAI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x00 -> Just |> SRLI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x20 -> Just |> SRAI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
_ -> Nothing
|
||||
0x2 -> Just $ SLTI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x3 -> Just $ SLTIU (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x2 -> Just |> SLTI (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x3 -> Just |> SLTIU (ITypeFields opcode rd funct3 rs1 imm)
|
||||
_ -> Nothing
|
||||
|
||||
0b0000011 -> case funct3 of
|
||||
0x0 -> Just $ LB (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x1 -> Just $ LH (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x2 -> Just $ LW (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x4 -> Just $ LBU (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x5 -> Just $ LHU (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x0 -> Just |> LB (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x1 -> Just |> LH (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x2 -> Just |> LW (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x4 -> Just |> LBU (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x5 -> Just |> LHU (ITypeFields opcode rd funct3 rs1 imm)
|
||||
_ -> Nothing
|
||||
|
||||
0b1100111 -> case funct3 of
|
||||
0x0 -> Just $ JALR (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x0 -> Just |> JALR (ITypeFields opcode rd funct3 rs1 imm)
|
||||
_ -> Nothing
|
||||
|
||||
0b1110011 -> case imm of
|
||||
0x000 -> Just $ ECALL (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x001 -> Just $ EBREAK (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x000 -> Just |> ECALL (ITypeFields opcode rd funct3 rs1 imm)
|
||||
0x001 -> Just |> EBREAK (ITypeFields opcode rd funct3 rs1 imm)
|
||||
_ -> Nothing
|
||||
|
||||
_ -> Nothing
|
||||
|
|
@ -116,9 +117,9 @@ decodeSType :: Insn -> Maybe Opcode
|
|||
decodeSType insn =
|
||||
case opcode of
|
||||
0b0100011 -> case funct3 of
|
||||
0x0 -> Just $ SB (STypeFields opcode funct3 rs1 rs2 imm12) -- Store Byte
|
||||
0x1 -> Just $ SH (STypeFields opcode funct3 rs1 rs2 imm12) -- Store Halfword
|
||||
0x2 -> Just $ SW (STypeFields opcode funct3 rs1 rs2 imm12) -- Store Word
|
||||
0x0 -> Just |> SB (STypeFields opcode funct3 rs1 rs2 imm12) -- Store Byte
|
||||
0x1 -> Just |> SH (STypeFields opcode funct3 rs1 rs2 imm12) -- Store Halfword
|
||||
0x2 -> Just |> SW (STypeFields opcode funct3 rs1 rs2 imm12) -- Store Word
|
||||
_ -> Nothing
|
||||
_ -> Nothing
|
||||
where
|
||||
|
|
@ -132,12 +133,12 @@ decodeBType :: Insn -> Maybe Opcode
|
|||
decodeBType insn =
|
||||
case opcode of
|
||||
0b1100011 -> case funct3 of
|
||||
0x0 -> Just $ BEQ (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if equal
|
||||
0x1 -> Just $ BNE (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if not equal
|
||||
0x4 -> Just $ BLT (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if less than
|
||||
0x5 -> Just $ BGE (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if greater or equal
|
||||
0x6 -> Just $ BLTU (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if less than (unsigned)
|
||||
0x7 -> Just $ BGEU (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if greater or equal (unsigned)
|
||||
0x0 -> Just |> BEQ (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if equal
|
||||
0x1 -> Just |> BNE (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if not equal
|
||||
0x4 -> Just |> BLT (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if less than
|
||||
0x5 -> Just |> BGE (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if greater or equal
|
||||
0x6 -> Just |> BLTU (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if less than (unsigned)
|
||||
0x7 -> Just |> BGEU (BTypeFields opcode funct3 rs1 rs2 imm13) -- Branch if greater or equal (unsigned)
|
||||
_ -> Nothing
|
||||
_ -> Nothing
|
||||
where
|
||||
|
|
@ -149,8 +150,8 @@ decodeBType insn =
|
|||
|
||||
decodeUType :: Insn -> Maybe Opcode
|
||||
decodeUType insn = case opcode of
|
||||
0b0110111 -> Just $ LUI (UTypeFields opcode rd imm20) -- LUI
|
||||
0b0010111 -> Just $ AUIPC (UTypeFields opcode rd imm20) -- AUIPC
|
||||
0b0110111 -> Just |> LUI (UTypeFields opcode rd imm20) -- LUI
|
||||
0b0010111 -> Just |> AUIPC (UTypeFields opcode rd imm20) -- AUIPC
|
||||
_ -> Nothing
|
||||
where
|
||||
opcode = getOpcode insn
|
||||
|
|
@ -158,7 +159,7 @@ decodeUType insn = case opcode of
|
|||
imm20 = getImm20UType insn
|
||||
|
||||
getImm21JType :: Insn -> Unsigned 21
|
||||
getImm21JType instr = bitCoerce $ imm20 ++# imm10_1 ++# imm11 ++# imm19_12 ++# zero
|
||||
getImm21JType instr = bitCoerce |> imm20 ++# imm10_1 ++# imm11 ++# imm19_12 ++# zero
|
||||
where
|
||||
imm20 = slice d31 d31 (pack instr) -- imm[20]
|
||||
imm10_1 = slice d30 d21 (pack instr) -- imm[10:1]
|
||||
|
|
@ -169,7 +170,7 @@ getImm21JType instr = bitCoerce $ imm20 ++# imm10_1 ++# imm11 ++# imm19_12 ++# z
|
|||
decodeJType :: Insn -> Maybe Opcode
|
||||
decodeJType insn =
|
||||
case opcode of
|
||||
0b1101111 -> Just $ JAL (JTypeFields opcode rd imm21) -- JAL
|
||||
0b1101111 -> Just |> JAL (JTypeFields opcode rd imm21) -- JAL
|
||||
_ -> Nothing
|
||||
where
|
||||
opcode = getOpcode insn
|
||||
|
|
@ -177,22 +178,22 @@ decodeJType insn =
|
|||
imm21 = getImm21JType insn
|
||||
|
||||
getOpcode :: Insn -> Unsigned 7
|
||||
getOpcode instr = bitCoerce $ slice d6 d0 (pack instr)
|
||||
getOpcode instr = bitCoerce |> slice d6 d0 (pack instr)
|
||||
|
||||
getImm12 :: Insn -> Unsigned 12
|
||||
getImm12 instr = bitCoerce $ slice d31 d20 (pack instr)
|
||||
getImm12 instr = bitCoerce |> slice d31 d20 (pack instr)
|
||||
|
||||
getImm12SType :: Insn -> Unsigned 12
|
||||
getImm12SType instr = bitCoerce $ immediateUpper ++# immediateLower
|
||||
getImm12SType instr = bitCoerce |> immediateUpper ++# immediateLower
|
||||
where
|
||||
immediateUpper = (slice d31 d25 (pack instr))
|
||||
immediateLower = (slice d11 d7 (pack instr))
|
||||
|
||||
getImm20UType :: Insn -> Unsigned 20
|
||||
getImm20UType instr = bitCoerce $ slice d31 d12 (pack instr)
|
||||
getImm20UType instr = bitCoerce |> slice d31 d12 (pack instr)
|
||||
|
||||
getImm13BType :: Insn -> Unsigned 13
|
||||
getImm13BType instr = bitCoerce $ imm12 ++# imm10_5 ++# imm4_1 ++# imm11 ++# zero
|
||||
getImm13BType instr = bitCoerce |> imm12 ++# imm10_5 ++# imm4_1 ++# imm11 ++# zero
|
||||
where
|
||||
imm12 = slice d31 d31 (pack instr) -- imm[12]
|
||||
imm10_5 = slice d30 d25 (pack instr) -- imm[10:5]
|
||||
|
|
@ -201,16 +202,16 @@ getImm13BType instr = bitCoerce $ imm12 ++# imm10_5 ++# imm4_1 ++# imm11 ++# zer
|
|||
zero = 0 :: BitVector 1 -- LSB always zero for B-type
|
||||
|
||||
getFunct3 :: Insn -> Unsigned 3
|
||||
getFunct3 instr = bitCoerce $ slice d14 d12 (pack instr)
|
||||
getFunct3 instr = bitCoerce |> slice d14 d12 (pack instr)
|
||||
|
||||
getFunct7 :: Insn -> Unsigned 7
|
||||
getFunct7 instr = bitCoerce $ slice d31 d25 (pack instr)
|
||||
getFunct7 instr = bitCoerce |> slice d31 d25 (pack instr)
|
||||
|
||||
getRd :: Insn -> Unsigned 5
|
||||
getRd instr = bitCoerce $ slice d11 d7 (pack instr)
|
||||
getRd instr = bitCoerce |> slice d11 d7 (pack instr)
|
||||
|
||||
getRs2 :: Insn -> Unsigned 5
|
||||
getRs2 instr = bitCoerce $ slice d24 d20 (pack instr)
|
||||
getRs2 instr = bitCoerce |> slice d24 d20 (pack instr)
|
||||
|
||||
getRs1 :: Insn -> Unsigned 5
|
||||
getRs1 instr = bitCoerce $ slice d19 d15 (pack instr)
|
||||
getRs1 instr = bitCoerce |> slice d19 d15 (pack instr)
|
||||
|
|
|
|||
Reference in a new issue