--- a/packages/hal/common/current/ChangeLog
+++ b/packages/hal/common/current/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-25  Ilija Kocho <ilijak@siva.com.mk>
+
+    * include/hal_stub.h, src/hal_stub.c, src/thread-packets.c:
+    NUMREGS replaced by HAL_STUB_REGISTERS_SIZE in thread-packets.c
+    [Bugzilla 1001558]
+
 2012-03-14  Grant Edwards <grant.b.edwards@gmail.com>
 
 	* src/generic-stub.c (process_query): Fix compiler warning about

--- a/packages/hal/common/current/include/hal_stub.h
+++ b/packages/hal/common/current/include/hal_stub.h
@@ -82,6 +82,15 @@ typedef cyg_int32  int32;
 #endif
 #include <cyg/hal/generic-stub.h>
 
+// Some architectures use registers of different sizes, so NUMREGS
+// alone is not sufficient to size the register save area. For those
+// architectures, HAL_STUB_REGISTERS_SIZE is defined as the number
+// of target_register_t sized elements in the register save area.
+#ifndef HAL_STUB_REGISTERS_SIZE
+#define HAL_STUB_REGISTERS_SIZE NUMREGS
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif

--- a/packages/hal/common/current/src/hal_stub.c
+++ b/packages/hal/common/current/src/hal_stub.c
@@ -83,14 +83,6 @@
 //-----------------------------------------------------------------------------
 // Extra eCos data.
 
-// Some architectures use registers of different sizes, so NUMREGS
-// alone is not suffucient to size the register save area. For those
-// architectures, HAL_STUB_REGISTERS_SIZE is defined as the number
-// of target_register_t sized elements in the register save area.
-#ifndef HAL_STUB_REGISTERS_SIZE
-#define HAL_STUB_REGISTERS_SIZE NUMREGS
-#endif
-
 // Saved registers.
 HAL_SavedRegisters *_hal_registers;
 target_register_t registers[HAL_STUB_REGISTERS_SIZE];

--- a/packages/hal/common/current/src/thread-packets.c
+++ b/packages/hal/common/current/src/thread-packets.c
@@ -134,7 +134,7 @@ static void stub_copy_registers(
                            )
 {
   target_register_t * limit ;
-  limit = dest + NUMREGS ;
+  limit = dest + HAL_STUB_REGISTERS_SIZE ;
 
   while (dest < limit)  *dest++ = *src++ ;
 }
@@ -480,9 +480,10 @@ void stub_pkt_currthread(
                                 int bufmax)
 {
   threadref thread ;
+#if PKT_DEBUG
   char * base_out ;
   base_out = outbuf ;
-  
+#endif
   if (dbg_currthread(&thread))
     {
       *outbuf++ = 'Q' ;