From 0c780cfecebaec70269627cd5f91ba07dfc916ab Mon Sep 17 00:00:00 2001 From: Joscha Date: Wed, 6 Nov 2019 20:56:08 +0000 Subject: [PATCH] Swap STIV and LDIV Now the opcodes match the ones at https://github.com/mkiesinger/mimaFPGA#op-codes --- src/Mima/Instruction.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mima/Instruction.hs b/src/Mima/Instruction.hs index bd03210..946f650 100644 --- a/src/Mima/Instruction.hs +++ b/src/Mima/Instruction.hs @@ -14,14 +14,14 @@ import Data.Word import Mima.Util import Mima.Word -data SmallOpcode = LDC | LDV | STV | ADD | AND | OR | XOR | EQL | JMP | JMN | STIV | LDIV +data SmallOpcode = LDC | LDV | STV | ADD | AND | OR | XOR | EQL | JMP | JMN | LDIV | STIV deriving (Show, Eq, Ord) instance ToText SmallOpcode where toText = T.pack . show allSmallOpcodes :: [SmallOpcode] -allSmallOpcodes = [LDC, LDV, STV, ADD, AND, OR, XOR, EQL, JMP, JMN, STIV, LDIV] +allSmallOpcodes = [LDC, LDV, STV, ADD, AND, OR, XOR, EQL, JMP, JMN, LDIV, STIV] getSmallOpcode :: SmallOpcode -> Word32 getSmallOpcode LDC = 0 @@ -34,8 +34,8 @@ getSmallOpcode XOR = 6 getSmallOpcode EQL = 7 getSmallOpcode JMP = 8 getSmallOpcode JMN = 9 -getSmallOpcode STIV = 10 -getSmallOpcode LDIV = 11 +getSmallOpcode LDIV = 10 +getSmallOpcode STIV = 11 smallOpcodeMap :: Map.Map Word32 SmallOpcode smallOpcodeMap = Map.fromList [(getSmallOpcode oc, oc) | oc <- allSmallOpcodes]