register will show correct state now

voidash · Apr 20, 2022 · 906fa61 · 906fa61
1 parent a13d0a3
commit 906fa61
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -124,8 +124,8 @@ function App() {
       <button onClick={() => loadProgram()}> Load Program</button>
       <button onClick={() => debugMode()}> Debug Mode</button>
       <button onClick={() => stopDecoration()}> Run Mode</button>
-        <Flags/>
-        <Registers/>
+        {emulator == null ? "loading" : <Flags emulator={emulator as wasm.Emulator} />};
+        {emulator == null ? "loading" : <Registers emulator={emulator as wasm.Emulator} />};
         {emulator == null ? "loading" : <MemoryView emulator={emulator as wasm.Emulator} loaded={loaded}/>};
       </div>
     </div>

diff --git a/frontend/src/components/Flags/flags.tsx b/frontend/src/components/Flags/flags.tsx
@@ -1,4 +1,7 @@
 import {useState, useEffect} from 'react';
+
+
+import * as wasm from '../../wasm/wasm_8085';
 import './style.css'
 
 interface flag {
@@ -14,7 +17,7 @@ let FlagCheckbox = ({name, state}: flag) => {
     </div>
   )
 }
-export default function Flags({}) {
+export default function Flags({emulator}: {emulator: wasm.Emulator}) {
   return (<div className="flags">
             <FlagCheckbox name ="Zero" state={false}/>
             <FlagCheckbox name ="Sign" state={false}/>

diff --git a/frontend/src/components/Register/registers.tsx b/frontend/src/components/Register/registers.tsx
@@ -1,7 +1,7 @@
 import './register_style.css'
 
 import {useState, useEffect} from 'react';
-
+import * as wasm from '../../wasm/wasm_8085';
 interface register{
   name: string,
   value: string,
@@ -17,31 +17,27 @@ let Register = ({name, value, shouldHighlight, sixteenBit} : register) => {
 };
 
 
-export default function Registers() { 
+export default function Registers({emulator}: {emulator: wasm.Emulator}) { 
   return (
     <div>
 
-
-      <Register name="Accumulator" value ="0x00" sixteenBit={true}/>
+      <Register name="Accumulator" value ={"0x"+emulator.accumulator().toString(16)} sixteenBit={true}/>
       <div className="RegisterPair">
-          <Register name = "B" value = "0x00"/>
-          <Register name = "C" value = "0x00"/>
-        </div>
-
+          <Register name = "B" value = {"0x"+emulator.b().toString(16)} />
+          <Register name = "C" value = {"0x"+emulator.c().toString(16)} />
+      </div>
       <div className="RegisterPair">
-          <Register name = "D" value = "0x00"/>
-          <Register name = "E" value = "0x00"/>
-        </div>
-
+          <Register name = "D" value = {"0x"+emulator.d().toString(16)} />
+          <Register name = "E" value = {"0x"+emulator.e().toString(16)} />
+      </div>
       <div className="RegisterPair">
-          <Register name = "H" value = "0x00"/>
-          <Register name = "L" value = "0x00"/>
-        </div>
-
-      <Register name="Stack Pointer" value="0x00" sixteenBit={true}/>
-      <Register name="Program Counter" value="0x00" sixteenBit={true}/>
+          <Register name = "H" value = {"0x"+emulator.h().toString(16)} />
+          <Register name = "L" value = {"0x"+emulator.l().toString(16)} />
+      </div>
+      <Register name="Stack Pointer" value={"0x"+emulator.stack_pointer().toString(16)}  sixteenBit={true}/>
+      <Register name="Program Counter" value={"0x"+emulator.program_counter().toString(16)}  sixteenBit={true}/>
 
-        </div>
+      </div>
 
   );
 }