diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-02-22 16:45:58 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2023-02-23 11:25:56 +0900 |
| commit | da0e6b99c7bae9b1e4644fa8b053d3ed4d67be3f (patch) | |
| tree | a7d0e68e431bd935b006e1b73fd1928e4f307aeb /vm_dump.c | |
| parent | e9e4e1cb46a1595a83127dd90091bc0951c7d4a9 (diff) | |
| download | ruby-da0e6b99c7bae9b1e4644fa8b053d3ed4d67be3f.tar.gz | |
Move `dump_machine_register` definitions
Diffstat (limited to 'vm_dump.c')
| -rw-r--r-- | vm_dump.c | 29 |
1 files changed, 10 insertions, 19 deletions
@@ -808,16 +808,20 @@ rb_print_backtrace(void) #endif #if defined __linux__ -# if defined __x86_64__ || defined __i386__ || defined __aarch64__ || defined __arm__ || defined __riscv || defined __loongarch64 -# define HAVE_PRINT_MACHINE_REGISTERS 1 +# if defined(__x86_64__) || defined(__i386__) +# define dump_machine_register(reg) (col_count = print_machine_register(mctx->gregs[REG_##reg], #reg, col_count, 80)) +# elif defined(__aarch64__) || defined(__arm__) || defined(__riscv) || defined(__loongarch64) +# define dump_machine_register(reg, regstr) (col_count = print_machine_register(reg, regstr, col_count, 80)) # endif #elif defined __APPLE__ -# if defined __x86_64__ || defined __i386__ || defined __aarch64__ -# define HAVE_PRINT_MACHINE_REGISTERS 1 +# if defined(__aarch64__) +# define dump_machine_register(reg, regstr) (col_count = print_machine_register(mctx->MCTX_SS_REG(reg), regstr, col_count, 80)) +# else +# define dump_machine_register(reg) (col_count = print_machine_register(mctx->MCTX_SS_REG(reg), #reg, col_count, 80)) # endif #endif -#ifdef HAVE_PRINT_MACHINE_REGISTERS +#ifdef dump_machine_register static int print_machine_register(size_t reg, const char *reg_name, int col_count, int max_col) { @@ -834,19 +838,6 @@ print_machine_register(size_t reg, const char *reg_name, int col_count, int max_ fputs(buf, stderr); return col_count; } -# ifdef __linux__ -# if defined(__x86_64__) || defined(__i386__) -# define dump_machine_register(reg) (col_count = print_machine_register(mctx->gregs[REG_##reg], #reg, col_count, 80)) -# elif defined(__aarch64__) || defined(__arm__) || defined(__riscv) || defined(__loongarch64) -# define dump_machine_register(reg, regstr) (col_count = print_machine_register(reg, regstr, col_count, 80)) -# endif -# elif defined __APPLE__ -# if defined(__aarch64__) -# define dump_machine_register(reg, regstr) (col_count = print_machine_register(mctx->MCTX_SS_REG(reg), regstr, col_count, 80)) -# else -# define dump_machine_register(reg) (col_count = print_machine_register(mctx->MCTX_SS_REG(reg), #reg, col_count, 80)) -# endif -# endif static void rb_dump_machine_register(const ucontext_t *ctx) @@ -1051,7 +1042,7 @@ rb_dump_machine_register(const ucontext_t *ctx) } #else # define rb_dump_machine_register(ctx) ((void)0) -#endif /* HAVE_PRINT_MACHINE_REGISTERS */ +#endif /* dump_machine_register */ void rb_vm_bugreport(const void *ctx) |