diff options
Diffstat (limited to 'gdb/sparc-nat.c')
-rw-r--r-- | gdb/sparc-nat.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c index 540bbcc..24c1472 100644 --- a/gdb/sparc-nat.c +++ b/gdb/sparc-nat.c @@ -101,16 +101,16 @@ fetch_inferior_registers (int regno) (PTRACE_ARG3_TYPE) & inferior_registers, 0)) perror ("ptrace_getregs"); - deprecated_registers[REGISTER_BYTE (0)] = 0; - memcpy (&deprecated_registers[REGISTER_BYTE (1)], + deprecated_registers[DEPRECATED_REGISTER_BYTE (0)] = 0; + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (1)], &inferior_registers.r_g1, 15 * REGISTER_RAW_SIZE (G0_REGNUM)); - *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = inferior_registers.r_ps; - *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = inferior_registers.r_pc; - *(int *) &deprecated_registers[REGISTER_BYTE (NPC_REGNUM)] + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)] = inferior_registers.r_npc; - *(int *) &deprecated_registers[REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = inferior_registers.r_y; for (i = G0_REGNUM; i <= O7_REGNUM; i++) deprecated_register_valid[i] = 1; @@ -134,9 +134,9 @@ fetch_inferior_registers (int regno) (PTRACE_ARG3_TYPE) & inferior_fp_registers, 0)) perror ("ptrace_getfpregs"); - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], &inferior_fp_registers, sizeof inferior_fp_registers.fpu_fr); - memcpy (&deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], &inferior_fp_registers.Fpu_fsr, sizeof (FPU_FSR_TYPE)); for (i = FP0_REGNUM; i <= FP0_REGNUM + 31; i++) deprecated_register_valid[i] = 1; @@ -147,19 +147,19 @@ fetch_inferior_registers (int regno) all (16 ptrace calls!) if we really need them. */ if (regno == -1) { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; - target_read_memory (sp, &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; + target_read_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM)); for (i = L0_REGNUM; i <= I7_REGNUM; i++) deprecated_register_valid[i] = 1; } else if (regno >= L0_REGNUM && regno <= I7_REGNUM) { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; - i = REGISTER_BYTE (regno); + CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; + i = DEPRECATED_REGISTER_BYTE (regno); if (deprecated_register_valid[regno]) printf_unfiltered ("register %d valid and read\n", regno); - target_read_memory (sp + i - REGISTER_BYTE (L0_REGNUM), + target_read_memory (sp + i - DEPRECATED_REGISTER_BYTE (L0_REGNUM), &deprecated_registers[i], REGISTER_RAW_SIZE (regno)); deprecated_register_valid[regno] = 1; } @@ -226,22 +226,22 @@ store_inferior_registers (int regno) if (wanna_store & STACK_REGS) { - CORE_ADDR sp = *(unsigned int *) & deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; + CORE_ADDR sp = *(unsigned int *) & deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; if (regno < 0 || regno == SP_REGNUM) { if (!deprecated_register_valid[L0_REGNUM + 5]) internal_error (__FILE__, __LINE__, "failed internal consistency check"); target_write_memory (sp, - &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM)); } else { if (!deprecated_register_valid[regno]) internal_error (__FILE__, __LINE__, "failed internal consistency check"); - target_write_memory (sp + REGISTER_BYTE (regno) - REGISTER_BYTE (L0_REGNUM), - &deprecated_registers[REGISTER_BYTE (regno)], + target_write_memory (sp + DEPRECATED_REGISTER_BYTE (regno) - DEPRECATED_REGISTER_BYTE (L0_REGNUM), + &deprecated_registers[DEPRECATED_REGISTER_BYTE (regno)], REGISTER_RAW_SIZE (regno)); } @@ -253,17 +253,17 @@ store_inferior_registers (int regno) internal_error (__FILE__, __LINE__, "failed internal consistency check"); memcpy (&inferior_registers.r_g1, - &deprecated_registers[REGISTER_BYTE (G1_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], 15 * REGISTER_RAW_SIZE (G1_REGNUM)); inferior_registers.r_ps = - *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)]; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)]; inferior_registers.r_pc = - *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)]; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)]; inferior_registers.r_npc = - *(int *) &deprecated_registers[REGISTER_BYTE (NPC_REGNUM)]; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)]; inferior_registers.r_y = - *(int *) &deprecated_registers[REGISTER_BYTE (Y_REGNUM)]; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)]; if (0 != ptrace (PTRACE_SETREGS, store_pid, (PTRACE_ARG3_TYPE) & inferior_registers, 0)) @@ -275,10 +275,10 @@ store_inferior_registers (int regno) if (!deprecated_register_valid[FP0_REGNUM + 9]) internal_error (__FILE__, __LINE__, "failed internal consistency check"); memcpy (&inferior_fp_registers, - &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], sizeof inferior_fp_registers.fpu_fr); memcpy (&inferior_fp_registers.Fpu_fsr, - &deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], sizeof (FPU_FSR_TYPE)); if (0 != ptrace (PTRACE_SETFPREGS, store_pid, @@ -311,15 +311,15 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, #define gregs ((struct regs *)core_reg_sect) /* G0 *always* holds 0. */ - *(int *) &deprecated_registers[REGISTER_BYTE (0)] = 0; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (0)] = 0; /* The globals and output registers. */ - memcpy (&deprecated_registers[REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1, + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G1_REGNUM)], &gregs->r_g1, 15 * REGISTER_RAW_SIZE (G1_REGNUM)); - *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps; - *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc; - *(int *) &deprecated_registers[REGISTER_BYTE (NPC_REGNUM)] = gregs->r_npc; - *(int *) &deprecated_registers[REGISTER_BYTE (Y_REGNUM)] = gregs->r_y; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)] = gregs->r_ps; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)] = gregs->r_pc; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (NPC_REGNUM)] = gregs->r_npc; + *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)] = gregs->r_y; /* My best guess at where to get the locals and input registers is exactly where they usually are, right above @@ -329,9 +329,9 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, { int sp; - sp = *(int *) &deprecated_registers[REGISTER_BYTE (SP_REGNUM)]; + sp = *(int *) &deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)]; if (0 != target_read_memory (sp, - &deprecated_registers[REGISTER_BYTE (L0_REGNUM)], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], 16 * REGISTER_RAW_SIZE (L0_REGNUM))) { /* fprintf_unfiltered so user can still use gdb */ @@ -348,9 +348,9 @@ fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, #define fpuregs ((struct fpu *) core_reg_sect) if (core_reg_size >= sizeof (struct fpu)) { - memcpy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], fpuregs->fpu_regs, sizeof (fpuregs->fpu_regs)); - memcpy (&deprecated_registers[REGISTER_BYTE (FPS_REGNUM)], + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], &fpuregs->fpu_fsr, sizeof (FPU_FSR_TYPE)); } else |