- if (core_reg_size == deprecated_register_bytes ())
- {
- for (regno = 0; regno < NUM_REGS; regno++)
- {
- regcache_raw_write (current_regcache, regno, srcp);
- srcp += register_size (current_gdbarch, regno);
- }
- }
- else if (mips_isa_regsize (current_gdbarch) == 4 &&
- core_reg_size == (2 * mips_isa_regsize (current_gdbarch)) * NUM_REGS)
- {
- /* This is a core file from a N32 executable, 64 bits are saved
- for all registers. */
- for (regno = 0; regno < NUM_REGS; regno++)
- {
- if (regno >= FP0_REGNUM && regno < (FP0_REGNUM + 32))
- {
- regcache_raw_write (current_regcache, regno, srcp);
- }
- else
- {
- regcache_raw_write (current_regcache, regno, srcp + 4);
- }
- srcp += 8;
- }
- }
- else
+ /* If regsize is 8, this is a N32 or N64 core file.
+ If regsize is 4, this is an O32 core file. */
+ if (core_reg_size != regsize * gdbarch_num_regs (gdbarch))