diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-04-16 02:11:12 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-04-17 02:44:30 -0400 |
| commit | 034685f9ce92cf6dfb6656745365b6a5904a8e84 (patch) | |
| tree | c4b591263048d0a9d89af68c9abd8e69786ed2f7 /sim/igen/gen-engine.c | |
| parent | 27b97b40bca216097d16d53fa9408a70cd281479 (diff) | |
| download | gdb-034685f9ce92cf6dfb6656745365b6a5904a8e84.zip gdb-034685f9ce92cf6dfb6656745365b6a5904a8e84.tar.gz gdb-034685f9ce92cf6dfb6656745365b6a5904a8e84.tar.bz2 | |
sim: replace CIA_{GET,SET} with CPU_PC_{GET,SET}
The CIA_{GET,SET} macros serve the same function as CPU_PC_{GET,SET}
except the latter adds a layer of indirection via the sim state. This
lets models set up different functions at runtime and doesn't reach so
directly into the arch-specific cpu state.
It also doesn't make sense to have two sets of macros that do exactly
the same thing, so lets standardize on the one that gets us more.
Diffstat (limited to 'sim/igen/gen-engine.c')
| -rw-r--r-- | sim/igen/gen-engine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sim/igen/gen-engine.c b/sim/igen/gen-engine.c index 232e50d..c081049 100644 --- a/sim/igen/gen-engine.c +++ b/sim/igen/gen-engine.c @@ -116,7 +116,7 @@ cache. */\n\ lf_putstr (file, "/* prime the main loop */\n"); lf_putstr (file, "SIM_ASSERT (current_cpu == 0);\n"); lf_putstr (file, "SIM_ASSERT (nr_cpus == 1);\n"); - lf_putstr (file, "cia = CIA_GET (CPU);\n"); + lf_putstr (file, "cia = CPU_PC_GET (CPU);\n"); lf_putstr (file, "\n"); lf_putstr (file, "while (1)\n"); @@ -202,9 +202,9 @@ cache. */\n\ lf_putstr (file, "/* process any events */\n"); lf_putstr (file, "if (sim_events_tick (sd))\n"); lf_putstr (file, " {\n"); - lf_putstr (file, " CIA_SET (CPU, cia);\n"); + lf_putstr (file, " CPU_PC_SET (CPU, cia);\n"); lf_putstr (file, " sim_events_process (sd);\n"); - lf_putstr (file, " cia = CIA_GET (CPU);\n"); + lf_putstr (file, " cia = CPU_PC_GET (CPU);\n"); lf_putstr (file, " }\n"); lf_indent (file, -4); @@ -236,7 +236,7 @@ after all the other CPU's and the event queue have been processed */\n\ lf_putstr (file, " {\n"); lf_indent (file, +4); lf_putstr (file, "sim_cpu *cpu = STATE_CPU (sd, current_cpu);\n"); - lf_putstr (file, "instruction_address cia = CIA_GET (cpu);\n"); + lf_putstr (file, "instruction_address cia = CPU_PC_GET (cpu);\n"); lf_putstr (file, "\n"); if (!options.gen.icache) @@ -245,7 +245,7 @@ after all the other CPU's and the event queue have been processed */\n\ options.insn_bit_size); print_engine_issue_prefix_hook (file); print_idecode_body (file, table, "cia ="); - lf_putstr (file, "CIA_SET (cpu, cia);\n"); + lf_putstr (file, "CPU_PC_SET (cpu, cia);\n"); print_engine_issue_postfix_hook (file); } |