falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gdbstub/sh4: fix build with USE_SOFTFLOAT_STRUCT_TYPES 

We have to use different type to access float values when
USE_SOFTFLOAT_STRUCT_TYPES is defined.

Rework SH4 version of cpu_gdb_{read,write}_register() using
a single case, and fixing the coding style. Use ldll_p() and
stfl_p() to access float values.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Aurelien Jarno 2012-09-16 13:12:21 +02:00 committed by Michael Roth
parent 1d465a94ad
commit 15658ad01b
1 changed files with 92 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
gdbstub.c
View File

@ -1226,33 +1226,48 @@ static int cpu_gdb_write_register(CPUOpenRISCState *env,
static int cpu_gdb_read_register(CPUSH4State *env, uint8_t *mem_buf, int n) static int cpu_gdb_read_register(CPUSH4State *env, uint8_t *mem_buf, int n)
{ {
if (n < 8) { switch (n) {
case 0 ... 7:
if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) { if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
GET_REGL(env->gregs[n + 16]); GET_REGL(env->gregs[n + 16]);
} else { } else {
GET_REGL(env->gregs[n]); GET_REGL(env->gregs[n]);
} }
} else if (n < 16) { case 8 ... 15:
GET_REGL(env->gregs[n]); GET_REGL(env->gregs[n]);
} else if (n >= 25 && n < 41) { case 16:
GET_REGL(env->fregs[(n - 25) + ((env->fpscr & FPSCR_FR) ? 16 : 0)]); GET_REGL(env->pc);
} else if (n >= 43 && n < 51) { case 17:
GET_REGL(env->gregs[n - 43]); GET_REGL(env->pr);
} else if (n >= 51 && n < 59) { case 18:
GET_REGL(env->gregs[n - (51 - 16)]); GET_REGL(env->gbr);
} case 19:
switch (n) { GET_REGL(env->vbr);
case 16: GET_REGL(env->pc); case 20:
case 17: GET_REGL(env->pr); GET_REGL(env->mach);
case 18: GET_REGL(env->gbr); case 21:
case 19: GET_REGL(env->vbr); GET_REGL(env->macl);
case 20: GET_REGL(env->mach); case 22:
case 21: GET_REGL(env->macl); GET_REGL(env->sr);
case 22: GET_REGL(env->sr); case 23:
case 23: GET_REGL(env->fpul); GET_REGL(env->fpul);
case 24: GET_REGL(env->fpscr); case 24:
case 41: GET_REGL(env->ssr); GET_REGL(env->fpscr);
case 42: GET_REGL(env->spc); case 25 ... 40:
if (env->fpscr & FPSCR_FR) {
stfl_p(mem_buf, env->fregs[n - 9]);
} else {
stfl_p(mem_buf, env->fregs[n - 25]);
}
return 4;
case 41:
GET_REGL(env->ssr);
case 42:
GET_REGL(env->spc);
case 43 ... 50:
GET_REGL(env->gregs[n - 43]);
case 51 ... 58:
GET_REGL(env->gregs[n - (51 - 16)]);
} }
return 0; return 0;
@ -1260,42 +1275,63 @@ static int cpu_gdb_read_register(CPUSH4State *env, uint8_t *mem_buf, int n)
static int cpu_gdb_write_register(CPUSH4State *env, uint8_t *mem_buf, int n) static int cpu_gdb_write_register(CPUSH4State *env, uint8_t *mem_buf, int n)
{ {
uint32_t tmp;
tmp = ldl_p(mem_buf);
if (n < 8) {
if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
env->gregs[n + 16] = tmp;
} else {
env->gregs[n] = tmp;
}
return 4;
} else if (n < 16) {
env->gregs[n] = tmp;
return 4;
} else if (n >= 25 && n < 41) {
env->fregs[(n - 25) + ((env->fpscr & FPSCR_FR) ? 16 : 0)] = tmp;
return 4;
} else if (n >= 43 && n < 51) {
env->gregs[n - 43] = tmp;
return 4;
} else if (n >= 51 && n < 59) {
env->gregs[n - (51 - 16)] = tmp;
return 4;
}
switch (n) { switch (n) {
case 16: env->pc = tmp; break; case 0 ... 7:
case 17: env->pr = tmp; break; if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
case 18: env->gbr = tmp; break; env->gregs[n + 16] = ldl_p(mem_buf);
case 19: env->vbr = tmp; break; } else {
case 20: env->mach = tmp; break; env->gregs[n] = ldl_p(mem_buf);
case 21: env->macl = tmp; break; }
case 22: env->sr = tmp; break; break;
case 23: env->fpul = tmp; break; case 8 ... 15:
case 24: env->fpscr = tmp; break; env->gregs[n] = ldl_p(mem_buf);
case 41: env->ssr = tmp; break; break;
case 42: env->spc = tmp; break; case 16:
env->pc = ldl_p(mem_buf);
break;
case 17:
env->pr = ldl_p(mem_buf);
break;
case 18:
env->gbr = ldl_p(mem_buf);
break;
case 19:
env->vbr = ldl_p(mem_buf);
break;
case 20:
env->mach = ldl_p(mem_buf);
break;
case 21:
env->macl = ldl_p(mem_buf);
break;
case 22:
env->sr = ldl_p(mem_buf);
break;
case 23:
env->fpul = ldl_p(mem_buf);
break;
case 24:
env->fpscr = ldl_p(mem_buf);
break;
case 25 ... 40:
if (env->fpscr & FPSCR_FR) {
env->fregs[n - 9] = ldfl_p(mem_buf);
} else {
env->fregs[n - 25] = ldfl_p(mem_buf);
}
break;
case 41:
env->ssr = ldl_p(mem_buf);
break;
case 42:
env->spc = ldl_p(mem_buf);
break;
case 43 ... 50:
env->gregs[n - 43] = ldl_p(mem_buf);
break;
case 51 ... 58:
env->gregs[n - (51 - 16)] = ldl_p(mem_buf);
break;
default: return 0; default: return 0;
} }