disas: Replace straggling CS_ARCH_SYSZ
PATCH 1/1 disas: Replace straggling CS_ARCH_SYSZ
When updating to capstone v6, the define CS_ARCH_SYSZ was replaced with CS_ARCH_SYSTEMZ, except here. On systems without capstone-devel installed, this causes a compile error:
../disas/disas-host.c: In function ‘initialize_debug_host’:
../disas/disas-host.c:78:24: error: ‘CS_ARCH_SYSZ’ undeclared (first use in this function); did you mean ‘CS_ARCH_SH’?
78 | s->info.cap_arch = CS_ARCH_SYSZ;
| ^~~~~~~~~~~~
| CS_ARCH_SH ../disas/disas-host.c:78:24: note: each undeclared identifier is reported only once for each function it appears in
Rather than making capstone required, replace the constant with the same one used elsewhere after that change.
--- disas/disas-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
disas/disas-host.c +1 -1
@@ -75,7 +75,7 @@ static void initialize_debug_host(CPUDebug *s)#elif defined(__m68k__) s->info.print_insn = print_insn_m68k;#elif defined(__s390x__) - s->info.cap_arch =CS_ARCH_SYSZ ; + s->info.cap_arch =CS_ARCH_SYSTEMZ ; s->info.cap_insn_unit =2 ; s->info.cap_insn_split =6 ;#elif defined(__hppa__)
Signature · 1 line
2.53.0
Quoted 9 lines · Eric Farman
When updating to capstone v6, the define
CS_ARCH_SYSZwas replaced withCS_ARCH_SYSTEMZ, except here. On systems without capstone-devel installed, this causes a compile error:
../disas/disas-host.c: In function ‘initialize_debug_host’:
../disas/disas-host.c:78:24: error: ‘CS_ARCH_SYSZ’ undeclared (first use in this function); did you mean ‘CS_ARCH_SH’?78 | s->info.cap_arch = CS_ARCH_SYSZ; | ^~~~~~~~~~~~ | CS_ARCH_SH
Quoted 7 lines
../disas/disas-host.c:78:24: note: each undeclared identifier is reported only once for each function it appears inRather than making capstone required, replace the constant with the same one used elsewhere after that change.
Fixes c8220a096f ("target/s390x: Update capstone disassembly to v6")Signed-off-by Eric Farman <[email protected]>
Thanks Eric, I just noticed the same compile error and this resolved it for me.
Quoted 11 lines · Eric Farman
When updating to capstone v6, the define
CS_ARCH_SYSZwas replaced withCS_ARCH_SYSTEMZ, except here. On systems without capstone-devel installed, this causes a compile error:
../disas/disas-host.c: In function ‘initialize_debug_host’:
../disas/disas-host.c:78:24: error: ‘CS_ARCH_SYSZ’ undeclared (first use in this function); did you mean ‘CS_ARCH_SH’?78 | s->info.cap_arch = CS_ARCH_SYSZ; | ^~~~~~~~~~~~ | CS_ARCH_SH
../disas/disas-host.c:78:24: note: each undeclared identifier is reported only once for each function it appears in
Quoted 8 lines
Rather than making capstone required, replace the constant with the same one used elsewhere after that change.
Fixes c8220a096f ("target/s390x: Update capstone disassembly to v6")Signed-off-by Eric Farman <[email protected]>--- disas/disas-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 11 lines · Eric Farman
When updating to capstone v6, the define
CS_ARCH_SYSZwas replaced withCS_ARCH_SYSTEMZ, except here. On systems without capstone-devel installed, this causes a compile error:
../disas/disas-host.c: In function ‘initialize_debug_host’:
../disas/disas-host.c:78:24: error: ‘CS_ARCH_SYSZ’ undeclared (first use in this function); did you mean ‘CS_ARCH_SH’?78 | s->info.cap_arch = CS_ARCH_SYSZ; | ^~~~~~~~~~~~ | CS_ARCH_SH
../disas/disas-host.c:78:24: note: each undeclared identifier is reported only once for each function it appears in
Quoted 8 lines
Rather than making capstone required, replace the constant with the same one used elsewhere after that change.
Fixes c8220a096f ("target/s390x: Update capstone disassembly to v6")Signed-off-by Eric Farman<[email protected]>--- disas/disas-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Whoops, sorry about that.
r~
Quoted 21 lines · Richard Henderson
Quoted 11 lines · Eric Farman
When updating to capstone v6, the define
CS_ARCH_SYSZwas replaced withCS_ARCH_SYSTEMZ, except here. On systems without capstone-devel installed, this causes a compile error:
../disas/disas-host.c: In function ‘initialize_debug_host’:
../disas/disas-host.c:78:24: error: ‘CS_ARCH_SYSZ’ undeclared (first use in this function); did you mean ‘CS_ARCH_SH’? 78 |s->info.cap_arch=CS_ARCH_SYSZ;
| ^~~~~~~~~~~~
|CS_ARCH_SH
../disas/disas-host.c:78:24: note: each undeclared identifier is reported only once for each function it appears inQuoted 8 lines
Rather than making capstone required, replace the constant with the same one used elsewhere after that change.
Fixes c8220a096f ("target/s390x: Update capstone disassembly to v6")Signed-off-by Eric Farman<[email protected]>---
disas/disas-host.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 5 lines
Whoops, sorry about that.
Reviewed-by Richard Henderson <[email protected]>r~
Queued.
r~