Skip to content

Commit f12d3f2

Browse files
Andrew Boienashif
authored andcommitted
debug: openocd: fix x86_64 build
The ESF members are not the same name for the stack pointer and floating point state. Signed-off-by: Andrew Boie <[email protected]>
1 parent 7defd09 commit f12d3f2

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

subsys/debug/openocd.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,13 @@ size_t _kernel_openocd_offsets[] = {
5454
[OPENOCD_OFFSET_T_STACK_PTR] = offsetof(struct k_thread,
5555
callee_saved.sp),
5656
#elif defined(CONFIG_X86)
57+
#if defined(CONFIG_X86_64)
58+
[OPENOCD_OFFSET_T_STACK_PTR] = offsetof(struct k_thread,
59+
callee_saved.rsp),
60+
#else
5761
[OPENOCD_OFFSET_T_STACK_PTR] = offsetof(struct k_thread,
5862
callee_saved.esp),
63+
#endif
5964
#elif defined(CONFIG_NIOS2)
6065
[OPENOCD_OFFSET_T_STACK_PTR] = offsetof(struct k_thread,
6166
callee_saved.sp),
@@ -78,8 +83,12 @@ size_t _kernel_openocd_offsets[] = {
7883
preempt_float),
7984
[OPENOCD_OFFSET_T_COOP_FLOAT] = OPENOCD_UNIMPLEMENTED,
8085
#elif defined(CONFIG_FLOAT) && defined(CONFIG_X86)
86+
#if defined(CONFIG_X86_64)
87+
[OPENOCD_OFFSET_T_PREEMPT_FLOAT] = offsetof(struct _thread_arch, sse),
88+
#else
8189
[OPENOCD_OFFSET_T_PREEMPT_FLOAT] = offsetof(struct _thread_arch,
8290
preempFloatReg),
91+
#endif
8392
[OPENOCD_OFFSET_T_COOP_FLOAT] = OPENOCD_UNIMPLEMENTED,
8493
#else
8594
[OPENOCD_OFFSET_T_PREEMPT_FLOAT] = OPENOCD_UNIMPLEMENTED,

0 commit comments

Comments
 (0)