aboutsummaryrefslogtreecommitdiff
path: root/disas
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2023-05-03 08:23:27 +0100
committerRichard Henderson <richard.henderson@linaro.org>2023-05-11 09:49:51 +0100
commitb6235a759a4552d21c5b68d16c894aa5b96d4b96 (patch)
tree6eb5dfd90f8fe347183b4cd8762eabfe3167c014 /disas
parentf779026478773da05e3f5b4621dddc5c6d6542dc (diff)
disas: Remove target_ulong from the interface
Use uint64_t for the pc, and size_t for the size. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20230503072331.1747057-81-richard.henderson@linaro.org>
Diffstat (limited to 'disas')
-rw-r--r--disas/disas.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/disas/disas.c b/disas/disas.c
index d46f638a72..aac7cf3b03 100644
--- a/disas/disas.c
+++ b/disas/disas.c
@@ -204,10 +204,9 @@ static void initialize_debug_host(CPUDebug *s)
}
/* Disassemble this for me please... (debugging). */
-void target_disas(FILE *out, CPUState *cpu, target_ulong code,
- target_ulong size)
+void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size)
{
- target_ulong pc;
+ uint64_t pc;
int count;
CPUDebug s;
@@ -226,7 +225,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code,
}
for (pc = code; size > 0; pc += count, size -= count) {
- fprintf(out, "0x" TARGET_FMT_lx ": ", pc);
+ fprintf(out, "0x%08" PRIx64 ": ", pc);
count = s.info.print_insn(pc, &s.info);
fprintf(out, "\n");
if (count < 0) {
@@ -293,7 +292,7 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t size)
}
/* Disassemble this for me please... (debugging). */
-void disas(FILE *out, const void *code, unsigned long size)
+void disas(FILE *out, const void *code, size_t size)
{
uintptr_t pc;
int count;
@@ -325,7 +324,7 @@ void disas(FILE *out, const void *code, unsigned long size)
}
/* Look up symbol for debugging purpose. Returns "" if unknown. */
-const char *lookup_symbol(target_ulong orig_addr)
+const char *lookup_symbol(uint64_t orig_addr)
{
const char *symbol = "";
struct syminfo *s;
@@ -357,8 +356,8 @@ physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length,
}
/* Disassembler for the monitor. */
-void monitor_disas(Monitor *mon, CPUState *cpu,
- target_ulong pc, int nb_insn, int is_physical)
+void monitor_disas(Monitor *mon, CPUState *cpu, uint64_t pc,
+ int nb_insn, bool is_physical)
{
int count, i;
CPUDebug s;
@@ -379,13 +378,13 @@ void monitor_disas(Monitor *mon, CPUState *cpu,
}
if (!s.info.print_insn) {
- monitor_printf(mon, "0x" TARGET_FMT_lx
+ monitor_printf(mon, "0x%08" PRIx64
": Asm output not supported on this arch\n", pc);
return;
}
for (i = 0; i < nb_insn; i++) {
- g_string_append_printf(ds, "0x" TARGET_FMT_lx ": ", pc);
+ g_string_append_printf(ds, "0x%08" PRIx64 ": ", pc);
count = s.info.print_insn(pc, &s.info);
g_string_append_c(ds, '\n');
if (count < 0) {