Skip to content

Commit 906fa61

Browse files
committed
register will show correct state now
1 parent a13d0a3 commit 906fa61

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

frontend/src/App.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ function App() {
124124
<button onClick={() => loadProgram()}> Load Program</button>
125125
<button onClick={() => debugMode()}> Debug Mode</button>
126126
<button onClick={() => stopDecoration()}> Run Mode</button>
127-
<Flags/>
128-
<Registers/>
127+
{emulator == null ? "loading" : <Flags emulator={emulator as wasm.Emulator} />};
128+
{emulator == null ? "loading" : <Registers emulator={emulator as wasm.Emulator} />};
129129
{emulator == null ? "loading" : <MemoryView emulator={emulator as wasm.Emulator} loaded={loaded}/>};
130130
</div>
131131
</div>

frontend/src/components/Flags/flags.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import {useState, useEffect} from 'react';
2+
3+
4+
import * as wasm from '../../wasm/wasm_8085';
25
import './style.css'
36

47
interface flag {
@@ -14,7 +17,7 @@ let FlagCheckbox = ({name, state}: flag) => {
1417
</div>
1518
)
1619
}
17-
export default function Flags({}) {
20+
export default function Flags({emulator}: {emulator: wasm.Emulator}) {
1821
return (<div className="flags">
1922
<FlagCheckbox name ="Zero" state={false}/>
2023
<FlagCheckbox name ="Sign" state={false}/>
Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import './register_style.css'
22

33
import {useState, useEffect} from 'react';
4-
4+
import * as wasm from '../../wasm/wasm_8085';
55
interface register{
66
name: string,
77
value: string,
@@ -17,31 +17,27 @@ let Register = ({name, value, shouldHighlight, sixteenBit} : register) => {
1717
};
1818

1919

20-
export default function Registers() {
20+
export default function Registers({emulator}: {emulator: wasm.Emulator}) {
2121
return (
2222
<div>
2323

24-
25-
<Register name="Accumulator" value ="0x00" sixteenBit={true}/>
24+
<Register name="Accumulator" value ={"0x"+emulator.accumulator().toString(16)} sixteenBit={true}/>
2625
<div className="RegisterPair">
27-
<Register name = "B" value = "0x00"/>
28-
<Register name = "C" value = "0x00"/>
29-
</div>
30-
26+
<Register name = "B" value = {"0x"+emulator.b().toString(16)} />
27+
<Register name = "C" value = {"0x"+emulator.c().toString(16)} />
28+
</div>
3129
<div className="RegisterPair">
32-
<Register name = "D" value = "0x00"/>
33-
<Register name = "E" value = "0x00"/>
34-
</div>
35-
30+
<Register name = "D" value = {"0x"+emulator.d().toString(16)} />
31+
<Register name = "E" value = {"0x"+emulator.e().toString(16)} />
32+
</div>
3633
<div className="RegisterPair">
37-
<Register name = "H" value = "0x00"/>
38-
<Register name = "L" value = "0x00"/>
39-
</div>
40-
41-
<Register name="Stack Pointer" value="0x00" sixteenBit={true}/>
42-
<Register name="Program Counter" value="0x00" sixteenBit={true}/>
34+
<Register name = "H" value = {"0x"+emulator.h().toString(16)} />
35+
<Register name = "L" value = {"0x"+emulator.l().toString(16)} />
36+
</div>
37+
<Register name="Stack Pointer" value={"0x"+emulator.stack_pointer().toString(16)} sixteenBit={true}/>
38+
<Register name="Program Counter" value={"0x"+emulator.program_counter().toString(16)} sixteenBit={true}/>
4339

44-
</div>
40+
</div>
4541

4642
);
4743
}

0 commit comments

Comments
 (0)