Skip to content

Commit 9a51650

Browse files
miszrMichael Tokarev
authored andcommitted
target/sparc: Fix gdbstub incorrectly handling registers f32-f62
The gdbstub implementation for the Sparc architecture would incorrectly calculate the the floating point register offset. This resulted in, for example, registers f32 and f34 to point to the same value. The issue was caused by the confusion between even register numbers and even register indexes. For example, the register index of f32 is 64 and f34 is 65. Cc: [email protected] Fixes: 30038fd ("target-sparc: Change fpr representation to doubles.") Signed-off-by: Mikael Szreder <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Signed-off-by: Richard Henderson <[email protected]> Message-ID: <[email protected]> (cherry picked from commit 7a74e46) Signed-off-by: Michael Tokarev <[email protected]>
1 parent 5afb837 commit 9a51650

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

target/sparc/gdbstub.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,13 @@ int sparc_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
7979
}
8080
}
8181
if (n < 80) {
82-
/* f32-f62 (double width, even numbers only) */
83-
return gdb_get_reg64(mem_buf, env->fpr[(n - 32) / 2].ll);
82+
/* f32-f62 (16 double width registers, even register numbers only)
83+
* n == 64: f32 : env->fpr[16]
84+
* n == 65: f34 : env->fpr[17]
85+
* etc...
86+
* n == 79: f62 : env->fpr[31]
87+
*/
88+
return gdb_get_reg64(mem_buf, env->fpr[(n - 64) + 16].ll);
8489
}
8590
switch (n) {
8691
case 80:
@@ -173,8 +178,13 @@ int sparc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
173178
}
174179
return 4;
175180
} else if (n < 80) {
176-
/* f32-f62 (double width, even numbers only) */
177-
env->fpr[(n - 32) / 2].ll = tmp;
181+
/* f32-f62 (16 double width registers, even register numbers only)
182+
* n == 64: f32 : env->fpr[16]
183+
* n == 65: f34 : env->fpr[17]
184+
* etc...
185+
* n == 79: f62 : env->fpr[31]
186+
*/
187+
env->fpr[(n - 64) + 16].ll = tmp;
178188
} else {
179189
switch (n) {
180190
case 80:

0 commit comments

Comments
 (0)