File tree Expand file tree Collapse file tree 4 files changed +10
-15
lines changed Expand file tree Collapse file tree 4 files changed +10
-15
lines changed Original file line number Diff line number Diff line change @@ -30,11 +30,6 @@ class cpu_device
30
30
exec_mos6502 *cpu;
31
31
uint64_t max_cycle_count;
32
32
uint64_t cycle_count;
33
- enum class inst_type
34
- {
35
- call,
36
- retern
37
- };
38
33
call_stack_filter *call_stack;
39
34
register_counter_filter *register_counter;
40
35
vector<i_cpu_filter *> filters;
@@ -57,7 +52,7 @@ class cpu_device
57
52
uint8_t get_read_count (status_flag_type type);
58
53
uint8_t get_write_count (status_flag_type type);
59
54
bool is_illegal_instruction ();
60
- bool is_call_instrunction ();
55
+ bool is_call_instruction ();
61
56
bool is_return_instruction ();
62
57
bool is_read_register_instruction (register_type type);
63
58
bool is_write_register_instruction (register_type type);
Original file line number Diff line number Diff line change @@ -13,11 +13,11 @@ class call_stack_filter : public i_cpu_filter
13
13
enum class inst_type
14
14
{
15
15
call,
16
- retern
16
+ return_back
17
17
};
18
18
cpu_device *cpu;
19
19
bool isCallInstr;
20
- bool isReternInstr ;
20
+ bool isReturnInstr ;
21
21
bool isInterruptInstr;
22
22
bool isReturned;
23
23
bool willReturn;
Original file line number Diff line number Diff line change @@ -192,7 +192,7 @@ bool cpu_device::is_illegal_instruction()
192
192
return cpu->isIllegalInstr ();
193
193
}
194
194
195
- bool cpu_device::is_call_instrunction ()
195
+ bool cpu_device::is_call_instruction ()
196
196
{
197
197
return cpu->isCallInstr ();
198
198
}
Original file line number Diff line number Diff line change @@ -17,12 +17,12 @@ void call_stack_filter::clear()
17
17
bool call_stack_filter::pre ()
18
18
{
19
19
isCallInstr = false ;
20
- isReternInstr = false ;
20
+ isReturnInstr = false ;
21
21
isInterruptInstr = false ;
22
22
23
23
pre_pc = cpu->get_register16 (register_type::PC);
24
24
25
- if (cpu->is_call_instrunction ())
25
+ if (cpu->is_call_instruction ())
26
26
{
27
27
call_stack.push_back (make_pair (inst_type::call, pre_pc));
28
28
isCallInstr = true ;
@@ -36,8 +36,8 @@ bool call_stack_filter::pre()
36
36
}
37
37
else
38
38
{
39
- call_stack.push_back (make_pair (inst_type::retern , pre_pc));
40
- isReternInstr = true ;
39
+ call_stack.push_back (make_pair (inst_type::return_back , pre_pc));
40
+ isReturnInstr = true ;
41
41
}
42
42
}
43
43
@@ -58,9 +58,9 @@ bool call_stack_filter::post()
58
58
{
59
59
call_stack.push_back (make_pair (inst_type::call, cpu->get_register16 (register_type::PC)));
60
60
}
61
- if (isReternInstr )
61
+ if (isReturnInstr )
62
62
{
63
- call_stack.push_back (make_pair (inst_type::retern , cpu->get_register16 (register_type::PC)));
63
+ call_stack.push_back (make_pair (inst_type::return_back , cpu->get_register16 (register_type::PC)));
64
64
}
65
65
if (!isReturned && isInterruptInstr)
66
66
{
You can’t perform that action at this time.
0 commit comments