Changeset 48816d7 in rtems

Timestamp:

Nov 2, 2007, 1:35:02 PM (13 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.9, 5, master

Children:

137c410

Parents:

7cb1d6ea

Message:

2007-11-02 Joel Sherrill <joel.sherrill@…>

• score/cpu/sparc/cpu.c, score/cpu/sparc/rtems/score/cpu.h, score/include/rtems/score/context.h, score/src/threadhandler.c: Fix stack so gdb backtrace does not print corrupted frame message after _Thread_Handler. Daniel Hellstrom <daniel@…> provided the SPARC implementation and I made it more general.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• score/cpu/sparc/cpu.c (modified) (2 diffs)
• score/cpu/sparc/rtems/score/cpu.h (modified) (1 diff)
• score/include/rtems/score/context.h (modified) (1 diff)
• score/src/threadhandler.c (modified) (1 diff)

cpukit/ChangeLog

@@ +1 @@
+2007-11-02      Joel Sherrill <joel.sherrill@OARcorp.com>
+
+        * score/cpu/sparc/cpu.c, score/cpu/sparc/rtems/score/cpu.h,
+        score/include/rtems/score/context.h, score/src/threadhandler.c: Fix
+        stack so gdb backtrace does not print corrupted frame message after
+        _Thread_Handler. Daniel Hellstrom <daniel@gaisler.com> provided the
+        SPARC implementation and I made it more general.
+
 2007-10-26      Glenn Humphrey <glenn.humphrey@OARcorp.com>
 

cpukit/score/cpu/sparc/cpu.c

@@ -2 +2 @@
  *  SPARC Dependent Source
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
@@ -302 +302 @@
     the_context->o7    = ((uint32_t  ) entry_point) - 8;
     the_context->o6_sp = stack_high - CPU_MINIMUM_STACK_FRAME_SIZE;
-    the_context->i6_fp = stack_high;
+    the_context->i6_fp = 0;
 
     /*

cpukit/score/cpu/sparc/rtems/score/cpu.h

@@ -792 +792 @@
 
 /*
+ *  This macro is invoked from _Thread_Handler to do whatever CPU
+ *  specific magic is required that must be done in the context of
+ *  the thread when it starts.
+ *
+ *  On the SPARC, this is setting the frame pointer so GDB is happy.
+ *  Make GDB stop unwinding at _Thread_Handler, previous register window
+ *  Frame pointer is 0 and calling address must be a function with starting
+ *  with a SAVE instruction. If return address is leaf-function (no SAVE) 
+ *  GDB will not look at prev reg window fp.
+ *
+ *  _Thread_Handler is known to start with SAVE.
+ */
+
+#define _CPU_Context_Initialization_at_thread_begin() \
+  do { \
+    asm volatile ("set _Thread_Handler,%%i7\n"::); \
+  } while (0)
+
+/*
  *  This routine is responsible for somehow restarting the currently
  *  executing task.  

cpukit/score/include/rtems/score/context.h

@@ -68 +68 @@
 #define _Context_Initialize(_the_context, _stack, _size, _isr, _entry, _is_fp) \
    _CPU_Context_Initialize( _the_context, _stack, _size, _isr, _entry, _is_fp )
+
+/**
+ *  This macro is invoked from _Thread_Handler to do whatever CPU
+ *  specific magic is required that must be done in the context of
+ *  the thread when it starts.
+ *
+ *  If the CPU architecture does not require any magic, then this
+ *  macro is empty.
+ */
+
+#if defined(_CPU_Context_Initialization_at_thread_begin)
+  #define _Context_Initialization_at_thread_begin() \
+     _CPU_Context_Initialization_at_thread_begin()
+#else
+  #define _Context_Initialization_at_thread_begin()
+#endif
 
 /**

cpukit/score/src/threadhandler.c

@@ -75 +75 @@
 
   executing = _Thread_Executing;
+
+  /*
+   * Some CPUs need to tinker with the call frame or registers when the 
+   * thread actually begins to execute for the first time.  This is a
+   * hook point where the port gets a shot at doing whatever it requires.
+   */
+  _Context_Initialization_at_thread_begin();
 
   /*