OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix Sparc32plus GDBstub support 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4689 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-06-07 08:03:05 +00:00
parent c588979bfc
commit 96d1912622
1 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gdbstub.c
View File

@ -469,40 +469,49 @@ static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
ppc_store_xer(env, tswapl(registers[101])); ppc_store_xer(env, tswapl(registers[101]));
} }
#elif defined (TARGET_SPARC) #elif defined (TARGET_SPARC)
#ifdef TARGET_ABI32
#define tswap_abi(val) tswap32(val &0xffffffff)
#else
#define tswap_abi(val) tswapl(val)
#endif
static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf) static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
{ {
#ifdef TARGET_ABI32
abi_ulong *registers = (abi_ulong *)mem_buf;
#else
target_ulong *registers = (target_ulong *)mem_buf; target_ulong *registers = (target_ulong *)mem_buf;
#endif
int i; int i;
/* fill in g0..g7 */ /* fill in g0..g7 */
for(i = 0; i < 8; i++) { for(i = 0; i < 8; i++) {
registers[i] = tswapl(env->gregs[i]); registers[i] = tswap_abi(env->gregs[i]);
} }
/* fill in register window */ /* fill in register window */
for(i = 0; i < 24; i++) { for(i = 0; i < 24; i++) {
registers[i + 8] = tswapl(env->regwptr[i]); registers[i + 8] = tswap_abi(env->regwptr[i]);
} }
#ifndef TARGET_SPARC64 #if !defined(TARGET_SPARC64) || defined(TARGET_ABI32)
/* fill in fprs */ /* fill in fprs */
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
registers[i + 32] = tswapl(*((uint32_t *)&env->fpr[i])); registers[i + 32] = tswap_abi(*((uint32_t *)&env->fpr[i]));
} }
/* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */ /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
registers[64] = tswapl(env->y); registers[64] = tswap_abi(env->y);
{ {
target_ulong tmp; uint32_t tmp;
tmp = GET_PSR(env); tmp = GET_PSR(env);
registers[65] = tswapl(tmp); registers[65] = tswap32(tmp);
} }
registers[66] = tswapl(env->wim); registers[66] = tswap_abi(env->wim);
registers[67] = tswapl(env->tbr); registers[67] = tswap_abi(env->tbr);
registers[68] = tswapl(env->pc); registers[68] = tswap_abi(env->pc);
registers[69] = tswapl(env->npc); registers[69] = tswap_abi(env->npc);
registers[70] = tswapl(env->fsr); registers[70] = tswap_abi(env->fsr);
registers[71] = 0; /* csr */ registers[71] = 0; /* csr */
registers[72] = 0; registers[72] = 0;
return 73 * sizeof(target_ulong); return 73 * sizeof(uint32_t);
#else #else
/* fill in fprs */ /* fill in fprs */
for (i = 0; i < 64; i += 2) { for (i = 0; i < 64; i += 2) {
@ -527,30 +536,34 @@ static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size) static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
{ {
#ifdef TARGET_ABI32
abi_ulong *registers = (abi_ulong *)mem_buf;
#else
target_ulong *registers = (target_ulong *)mem_buf; target_ulong *registers = (target_ulong *)mem_buf;
#endif
int i; int i;
/* fill in g0..g7 */ /* fill in g0..g7 */
for(i = 0; i < 7; i++) { for(i = 0; i < 7; i++) {
env->gregs[i] = tswapl(registers[i]); env->gregs[i] = tswap_abi(registers[i]);
} }
/* fill in register window */ /* fill in register window */
for(i = 0; i < 24; i++) { for(i = 0; i < 24; i++) {
env->regwptr[i] = tswapl(registers[i + 8]); env->regwptr[i] = tswap_abi(registers[i + 8]);
} }
#ifndef TARGET_SPARC64 #if !defined(TARGET_SPARC64) || defined(TARGET_ABI32)
/* fill in fprs */ /* fill in fprs */
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
*((uint32_t *)&env->fpr[i]) = tswapl(registers[i + 32]); *((uint32_t *)&env->fpr[i]) = tswap_abi(registers[i + 32]);
} }
/* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */ /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
env->y = tswapl(registers[64]); env->y = tswap_abi(registers[64]);
PUT_PSR(env, tswapl(registers[65])); PUT_PSR(env, tswap_abi(registers[65]));
env->wim = tswapl(registers[66]); env->wim = tswap_abi(registers[66]);
env->tbr = tswapl(registers[67]); env->tbr = tswap_abi(registers[67]);
env->pc = tswapl(registers[68]); env->pc = tswap_abi(registers[68]);
env->npc = tswapl(registers[69]); env->npc = tswap_abi(registers[69]);
env->fsr = tswapl(registers[70]); env->fsr = tswap_abi(registers[70]);
#else #else
for (i = 0; i < 64; i += 2) { for (i = 0; i < 64; i += 2) {
uint64_t tmp; uint64_t tmp;
@ -574,6 +587,7 @@ static void cpu_gdb_write_registers(CPUState *env, uint8_t *mem_buf, int size)
env->y = tswapl(registers[69]); env->y = tswapl(registers[69]);
#endif #endif
} }
#undef tswap_abi
#elif defined (TARGET_ARM) #elif defined (TARGET_ARM)
static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf) static int cpu_gdb_read_registers(CPUState *env, uint8_t *mem_buf)
{ {