--- a/packages/hal/common/current/src/hal_stub.c
+++ b/packages/hal/common/current/src/hal_stub.c
@@ -5,29 +5,38 @@
 //      Helper functions for stub, specific to eCos HAL
 //
 //=============================================================================
-//####COPYRIGHTBEGIN####
-//                                                                          
-// -------------------------------------------                              
-// The contents of this file are subject to the Red Hat eCos Public License 
-// Version 1.1 (the "License"); you may not use this file except in         
-// compliance with the License.  You may obtain a copy of the License at    
-// http://www.redhat.com/                                                   
-//                                                                          
-// Software distributed under the License is distributed on an "AS IS"      
-// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the 
-// License for the specific language governing rights and limitations under 
-// the License.                                                             
-//                                                                          
-// The Original Code is eCos - Embedded Configurable Operating System,      
-// released September 30, 1998.                                             
-//                                                                          
-// The Initial Developer of the Original Code is Red Hat.                   
-// Portions created by Red Hat are                                          
-// Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.                             
-// All Rights Reserved.                                                     
-// -------------------------------------------                              
-//                                                                          
-//####COPYRIGHTEND####
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
 //=============================================================================
 //#####DESCRIPTIONBEGIN####
 //
@@ -647,7 +656,7 @@ void
         // GDB is expecting REGSIZE(SP) number of bytes.
         // We only have sizeof(addr) number.  Let's fill
         // the appropriate number of bytes intelligently.
-        target_register_t extend_val = 0;
+        extend_val = 0;
 #ifdef CYGARC_SIGN_EXTEND_REGISTERS
         {
             unsigned long bits_in_addr = (sizeof(addr) << 3);  // ie Size in bytes * 8
@@ -811,6 +820,9 @@ static void
 int
 __read_mem_safe (void *dst, void *src, int count)
 {
+  if( !CYG_HAL_STUB_PERMIT_DATA_READ( src, count ) )
+    return 0;
+
   memCount = count;
   __do_copy_mem((unsigned char*) src, (unsigned char*) dst);
   return count - memCount;      // return number of bytes successfully read
@@ -824,6 +836,9 @@ int
 int
 __write_mem_safe (void *src, void *dst, int count)
 {
+  if( !CYG_HAL_STUB_PERMIT_DATA_READ( dst, count ) )
+    return 0;
+
   memCount = count;
   __do_copy_mem((unsigned char*) src, (unsigned char*) dst);
   return count - memCount;      // return number of bytes successfully written
@@ -946,6 +961,9 @@ static void
 int
 __read_progmem_safe (void *dst, void *src, int count)
 {
+  if( !CYG_HAL_STUB_PERMIT_CODE_READ( src, count ) )
+    return 0;
+
   memCount = count;
   __do_copy_from_progmem((unsigned char*) src, (unsigned char*) dst);
   return count - memCount;      // return number of bytes successfully read
@@ -959,6 +977,9 @@ int
 int
 __write_progmem_safe (void *src, void *dst, int count)
 {
+  if( !CYG_HAL_STUB_PERMIT_CODE_WRITE( dst, count ) )
+    return 0;
+
   memCount = count;
   __do_copy_to_progmem((unsigned char*) src, (unsigned char*) dst);
   return count - memCount;      // return number of bytes successfully written