[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/47] disas: Push const down through host disassembly
From: |
Richard Henderson |
Subject: |
[PULL 28/47] disas: Push const down through host disassembly |
Date: |
Thu, 7 Jan 2021 10:14:29 -1000 |
Reviewed-by: Joelle van Dyne <j@getutm.app>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/disas/dis-asm.h | 4 ++--
disas.c | 4 +---
disas/capstone.c | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h
index 2164762b46..d1133a4e04 100644
--- a/include/disas/dis-asm.h
+++ b/include/disas/dis-asm.h
@@ -358,7 +358,7 @@ typedef struct disassemble_info {
(bfd_vma addr, struct disassemble_info * info);
/* These are for buffer_read_memory. */
- bfd_byte *buffer;
+ const bfd_byte *buffer;
bfd_vma buffer_vma;
int buffer_length;
@@ -462,7 +462,7 @@ int print_insn_rx(bfd_vma, disassemble_info *);
#ifdef CONFIG_CAPSTONE
bool cap_disas_target(disassemble_info *info, uint64_t pc, size_t size);
-bool cap_disas_host(disassemble_info *info, void *code, size_t size);
+bool cap_disas_host(disassemble_info *info, const void *code, size_t size);
bool cap_disas_monitor(disassemble_info *info, uint64_t pc, int count);
bool cap_disas_plugin(disassemble_info *info, uint64_t pc, size_t size);
#else
diff --git a/disas.c b/disas.c
index de1de7be94..a61f95b580 100644
--- a/disas.c
+++ b/disas.c
@@ -299,10 +299,8 @@ char *plugin_disas(CPUState *cpu, uint64_t addr, size_t
size)
}
/* Disassemble this for me please... (debugging). */
-void disas(FILE *out, const void *ccode, unsigned long size)
+void disas(FILE *out, const void *code, unsigned long size)
{
- /* TODO: Push constness through the disas backends. */
- void *code = (void *)ccode;
uintptr_t pc;
int count;
CPUDebug s;
diff --git a/disas/capstone.c b/disas/capstone.c
index 7462c0e305..20bc8f9669 100644
--- a/disas/capstone.c
+++ b/disas/capstone.c
@@ -229,7 +229,7 @@ bool cap_disas_target(disassemble_info *info, uint64_t pc,
size_t size)
}
/* Disassemble SIZE bytes at CODE for the host. */
-bool cap_disas_host(disassemble_info *info, void *code, size_t size)
+bool cap_disas_host(disassemble_info *info, const void *code, size_t size)
{
csh handle;
const uint8_t *cbuf;
--
2.25.1
- [PULL 36/47] tcg/s390: Use tcg_tbrel_diff, (continued)
- [PULL 36/47] tcg/s390: Use tcg_tbrel_diff, Richard Henderson, 2021/01/07
- [PULL 20/47] tcg: Use Error with alloc_code_gen_buffer, Richard Henderson, 2021/01/07
- [PULL 33/47] tcg/ppc: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 37/47] tcg/s390: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 38/47] tcg/riscv: Fix branch range checks, Richard Henderson, 2021/01/07
- [PULL 34/47] tcg/sparc: Use tcg_tbrel_diff, Richard Henderson, 2021/01/07
- [PULL 45/47] tcg: Remove TCG_TARGET_SUPPORT_MIRROR, Richard Henderson, 2021/01/07
- [PULL 26/47] tcg/aarch64: Use B not BL for tcg_out_goto_long, Richard Henderson, 2021/01/07
- [PULL 41/47] accel/tcg: Add mips support to alloc_code_gen_buffer_splitwx_memfd, Richard Henderson, 2021/01/07
- [PULL 30/47] tcg: Introduce tcg_tbrel_diff, Richard Henderson, 2021/01/07
- [PULL 28/47] disas: Push const down through host disassembly,
Richard Henderson <=
- [PULL 31/47] tcg/ppc: Use tcg_tbrel_diff, Richard Henderson, 2021/01/07
- [PULL 35/47] tcg/sparc: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 42/47] tcg/mips: Do not assert on relocation overflow, Richard Henderson, 2021/01/07
- [PULL 39/47] tcg/riscv: Remove branch-over-branch fallback, Richard Henderson, 2021/01/07
- [PULL 40/47] tcg/riscv: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 47/47] tcg: Constify TCGLabelQemuLdst.raddr, Richard Henderson, 2021/01/07
- [PULL 44/47] tcg/arm: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 43/47] tcg/mips: Support split-wx code generation, Richard Henderson, 2021/01/07
- [PULL 46/47] tcg: Constify tcg_code_gen_epilogue, Richard Henderson, 2021/01/07
- Re: [PULL 00/47] tcg patch queue, no-reply, 2021/01/07