|
 |
5544c1b |
From b6407e30c30268cdeddec6e2b115f419647cc07f Mon Sep 17 00:00:00 2001
|
|
|
5544c1b |
From: Aurelien Jarno <aurelien@aurel32.net>
|
|
|
5544c1b |
Date: Sun, 16 Sep 2012 13:12:21 +0200
|
|
|
5544c1b |
Subject: [PATCH] gdbstub/sh4: fix build with USE_SOFTFLOAT_STRUCT_TYPES
|
|
|
5544c1b |
|
|
|
5544c1b |
We have to use different type to access float values when
|
|
|
5544c1b |
USE_SOFTFLOAT_STRUCT_TYPES is defined.
|
|
|
5544c1b |
|
|
|
5544c1b |
Rework SH4 version of cpu_gdb_{read,write}_register() using
|
|
|
5544c1b |
a single case, and fixing the coding style. Use ldll_p() and
|
|
|
5544c1b |
stfl_p() to access float values.
|
|
|
5544c1b |
|
|
|
5544c1b |
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
|
|
5544c1b |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
5544c1b |
---
|
|
|
5544c1b |
gdbstub.c | 144 +++++++++++++++++++++++++++++++++++++++-----------------------
|
|
|
5544c1b |
1 file changed, 90 insertions(+), 54 deletions(-)
|
|
|
5544c1b |
|
|
|
5544c1b |
diff --git a/gdbstub.c b/gdbstub.c
|
|
|
5544c1b |
index 5d37dd9..a91709f 100644
|
|
|
5544c1b |
--- a/gdbstub.c
|
|
|
5544c1b |
+++ b/gdbstub.c
|
|
|
5544c1b |
@@ -1226,33 +1226,48 @@ static int cpu_gdb_write_register(CPUOpenRISCState *env,
|
|
|
5544c1b |
|
|
|
5544c1b |
static int cpu_gdb_read_register(CPUSH4State *env, uint8_t *mem_buf, int n)
|
|
|
5544c1b |
{
|
|
|
5544c1b |
- if (n < 8) {
|
|
|
5544c1b |
+ switch (n) {
|
|
|
5544c1b |
+ case 0 ... 7:
|
|
|
5544c1b |
if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
|
|
|
5544c1b |
GET_REGL(env->gregs[n + 16]);
|
|
|
5544c1b |
} else {
|
|
|
5544c1b |
GET_REGL(env->gregs[n]);
|
|
|
5544c1b |
}
|
|
|
5544c1b |
- } else if (n < 16) {
|
|
|
5544c1b |
+ case 8 ... 15:
|
|
|
5544c1b |
GET_REGL(env->gregs[n]);
|
|
|
5544c1b |
- } else if (n >= 25 && n < 41) {
|
|
|
5544c1b |
- GET_REGL(env->fregs[(n - 25) + ((env->fpscr & FPSCR_FR) ? 16 : 0)]);
|
|
|
5544c1b |
- } else if (n >= 43 && n < 51) {
|
|
|
5544c1b |
- GET_REGL(env->gregs[n - 43]);
|
|
|
5544c1b |
- } else if (n >= 51 && n < 59) {
|
|
|
5544c1b |
- GET_REGL(env->gregs[n - (51 - 16)]);
|
|
|
5544c1b |
- }
|
|
|
5544c1b |
- switch (n) {
|
|
|
5544c1b |
- case 16: GET_REGL(env->pc);
|
|
|
5544c1b |
- case 17: GET_REGL(env->pr);
|
|
|
5544c1b |
- case 18: GET_REGL(env->gbr);
|
|
|
5544c1b |
- case 19: GET_REGL(env->vbr);
|
|
|
5544c1b |
- case 20: GET_REGL(env->mach);
|
|
|
5544c1b |
- case 21: GET_REGL(env->macl);
|
|
|
5544c1b |
- case 22: GET_REGL(env->sr);
|
|
|
5544c1b |
- case 23: GET_REGL(env->fpul);
|
|
|
5544c1b |
- case 24: GET_REGL(env->fpscr);
|
|
|
5544c1b |
- case 41: GET_REGL(env->ssr);
|
|
|
5544c1b |
- case 42: GET_REGL(env->spc);
|
|
|
5544c1b |
+ case 16:
|
|
|
5544c1b |
+ GET_REGL(env->pc);
|
|
|
5544c1b |
+ case 17:
|
|
|
5544c1b |
+ GET_REGL(env->pr);
|
|
|
5544c1b |
+ case 18:
|
|
|
5544c1b |
+ GET_REGL(env->gbr);
|
|
|
5544c1b |
+ case 19:
|
|
|
5544c1b |
+ GET_REGL(env->vbr);
|
|
|
5544c1b |
+ case 20:
|
|
|
5544c1b |
+ GET_REGL(env->mach);
|
|
|
5544c1b |
+ case 21:
|
|
|
5544c1b |
+ GET_REGL(env->macl);
|
|
|
5544c1b |
+ case 22:
|
|
|
5544c1b |
+ GET_REGL(env->sr);
|
|
|
5544c1b |
+ case 23:
|
|
|
5544c1b |
+ GET_REGL(env->fpul);
|
|
|
5544c1b |
+ case 24:
|
|
|
5544c1b |
+ GET_REGL(env->fpscr);
|
|
|
5544c1b |
+ case 25 ... 40:
|
|
|
5544c1b |
+ if (env->fpscr & FPSCR_FR) {
|
|
|
5544c1b |
+ stfl_p(mem_buf, env->fregs[n - 9]);
|
|
|
5544c1b |
+ } else {
|
|
|
5544c1b |
+ stfl_p(mem_buf, env->fregs[n - 25]);
|
|
|
5544c1b |
+ }
|
|
|
5544c1b |
+ return 4;
|
|
|
5544c1b |
+ case 41:
|
|
|
5544c1b |
+ GET_REGL(env->ssr);
|
|
|
5544c1b |
+ case 42:
|
|
|
5544c1b |
+ GET_REGL(env->spc);
|
|
|
5544c1b |
+ case 43 ... 50:
|
|
|
5544c1b |
+ GET_REGL(env->gregs[n - 43]);
|
|
|
5544c1b |
+ case 51 ... 58:
|
|
|
5544c1b |
+ GET_REGL(env->gregs[n - (51 - 16)]);
|
|
|
5544c1b |
}
|
|
|
5544c1b |
|
|
|
5544c1b |
return 0;
|
|
|
5544c1b |
@@ -1260,42 +1275,63 @@ static int cpu_gdb_read_register(CPUSH4State *env, uint8_t *mem_buf, int n)
|
|
|
5544c1b |
|
|
|
5544c1b |
static int cpu_gdb_write_register(CPUSH4State *env, uint8_t *mem_buf, int n)
|
|
|
5544c1b |
{
|
|
|
5544c1b |
- uint32_t tmp;
|
|
|
5544c1b |
-
|
|
|
5544c1b |
- tmp = ldl_p(mem_buf);
|
|
|
5544c1b |
-
|
|
|
5544c1b |
- if (n < 8) {
|
|
|
5544c1b |
+ switch (n) {
|
|
|
5544c1b |
+ case 0 ... 7:
|
|
|
5544c1b |
if ((env->sr & (SR_MD | SR_RB)) == (SR_MD | SR_RB)) {
|
|
|
5544c1b |
- env->gregs[n + 16] = tmp;
|
|
|
5544c1b |
+ env->gregs[n + 16] = ldl_p(mem_buf);
|
|
|
5544c1b |
} else {
|
|
|
5544c1b |
- env->gregs[n] = tmp;
|
|
|
5544c1b |
+ env->gregs[n] = ldl_p(mem_buf);
|
|
|
5544c1b |
}
|
|
|
5544c1b |
- return 4;
|
|
|
5544c1b |
- } else if (n < 16) {
|
|
|
5544c1b |
- env->gregs[n] = tmp;
|
|
|
5544c1b |
- return 4;
|
|
|
5544c1b |
- } else if (n >= 25 && n < 41) {
|
|
|
5544c1b |
- env->fregs[(n - 25) + ((env->fpscr & FPSCR_FR) ? 16 : 0)] = tmp;
|
|
|
5544c1b |
- return 4;
|
|
|
5544c1b |
- } else if (n >= 43 && n < 51) {
|
|
|
5544c1b |
- env->gregs[n - 43] = tmp;
|
|
|
5544c1b |
- return 4;
|
|
|
5544c1b |
- } else if (n >= 51 && n < 59) {
|
|
|
5544c1b |
- env->gregs[n - (51 - 16)] = tmp;
|
|
|
5544c1b |
- return 4;
|
|
|
5544c1b |
- }
|
|
|
5544c1b |
- switch (n) {
|
|
|
5544c1b |
- case 16: env->pc = tmp; break;
|
|
|
5544c1b |
- case 17: env->pr = tmp; break;
|
|
|
5544c1b |
- case 18: env->gbr = tmp; break;
|
|
|
5544c1b |
- case 19: env->vbr = tmp; break;
|
|
|
5544c1b |
- case 20: env->mach = tmp; break;
|
|
|
5544c1b |
- case 21: env->macl = tmp; break;
|
|
|
5544c1b |
- case 22: env->sr = tmp; break;
|
|
|
5544c1b |
- case 23: env->fpul = tmp; break;
|
|
|
5544c1b |
- case 24: env->fpscr = tmp; break;
|
|
|
5544c1b |
- case 41: env->ssr = tmp; break;
|
|
|
5544c1b |
- case 42: env->spc = tmp; break;
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 8 ... 15:
|
|
|
5544c1b |
+ env->gregs[n] = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 16:
|
|
|
5544c1b |
+ env->pc = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 17:
|
|
|
5544c1b |
+ env->pr = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 18:
|
|
|
5544c1b |
+ env->gbr = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 19:
|
|
|
5544c1b |
+ env->vbr = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 20:
|
|
|
5544c1b |
+ env->mach = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 21:
|
|
|
5544c1b |
+ env->macl = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 22:
|
|
|
5544c1b |
+ env->sr = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 23:
|
|
|
5544c1b |
+ env->fpul = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 24:
|
|
|
5544c1b |
+ env->fpscr = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 25 ... 40:
|
|
|
5544c1b |
+ if (env->fpscr & FPSCR_FR) {
|
|
|
5544c1b |
+ env->fregs[n - 9] = ldfl_p(mem_buf);
|
|
|
5544c1b |
+ } else {
|
|
|
5544c1b |
+ env->fregs[n - 25] = ldfl_p(mem_buf);
|
|
|
5544c1b |
+ }
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 41:
|
|
|
5544c1b |
+ env->ssr = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 42:
|
|
|
5544c1b |
+ env->spc = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 43 ... 50:
|
|
|
5544c1b |
+ env->gregs[n - 43] = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
+ case 51 ... 58:
|
|
|
5544c1b |
+ env->gregs[n - (51 - 16)] = ldl_p(mem_buf);
|
|
|
5544c1b |
+ break;
|
|
|
5544c1b |
default: return 0;
|
|
|
5544c1b |
}
|
|
|
5544c1b |
|