[Tinyos8051wg-commit] SF.net SVN: tinyos8051wg:[1099] trunk/diku/mcs51

[<mle...@us...>]

Revision: 1099
          http://tinyos8051wg.svn.sourceforge.net/tinyos8051wg/?rev=1099&view=rev
Author:   mleopold
Date:     2009-11-19 15:07:33 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
SDCC friendly updates, thanks to Pavel Pisa

Modified Paths:
--------------
    trunk/diku/mcs51/support/make/mcs51/mangleAppC.pl
    trunk/diku/mcs51/tos/chips/mcs51/mcs51hardware.h

Modified: trunk/diku/mcs51/support/make/mcs51/mangleAppC.pl
===================================================================
--- trunk/diku/mcs51/support/make/mcs51/mangleAppC.pl	2009-10-09 12:23:50 UTC (rev 1098)
+++ trunk/diku/mcs51/support/make/mcs51/mangleAppC.pl	2009-11-19 15:07:33 UTC (rev 1099)
@@ -360,6 +360,7 @@
   # (for some reason nesc doesn't produce prototypes and function defs the same way..
   s{^(\s*void(?:.*?)__vector_\d+\s*\(\s*void\s*\)\s+__attribute(?:__)?\(\((?:.*?)(?:__)?interrupt(?:__)?,?(?:.*)\)\)\s*\;)}{/*$1*/};
 
+
 #
 # Handle reentrant functions
 #
@@ -576,8 +577,7 @@
   if ( $KEIL || $SDCC || $IAR) {
       s{\b((?:__)?inline)\b}{ /*$1*/ }
   }
-
-    
+   
 ########################################################################
 # Convert datatypes                                                    #
 ########################################################################

Modified: trunk/diku/mcs51/tos/chips/mcs51/mcs51hardware.h
===================================================================
--- trunk/diku/mcs51/tos/chips/mcs51/mcs51hardware.h	2009-10-09 12:23:50 UTC (rev 1098)
+++ trunk/diku/mcs51/tos/chips/mcs51/mcs51hardware.h	2009-11-19 15:07:33 UTC (rev 1099)
@@ -104,16 +104,16 @@
 // atomic statement runtime support
 typedef uint8_t __nesc_atomic_t;
 
-inline void __nesc_disable_interrupt() { EA=0; }
-inline void __nesc_enable_interrupt()  { EA=1; }
+static inline void __nesc_disable_interrupt() { EA=0; }
+static inline void __nesc_enable_interrupt()  { EA=1; }
     
-inline __nesc_atomic_t __nesc_atomic_start(void) __attribute((spontaneous)) {
+inline __nesc_atomic_t __nesc_atomic_start(void) @safe() {
   __nesc_atomic_t tmp = EA;
-  EA = 0; 
+  EA = 0; //__nesc_disable_interrupt();
   return tmp;
 }
 
-inline void __nesc_atomic_end(__nesc_atomic_t oldSreg) __attribute__((spontaneous)) {
+inline void __nesc_atomic_end(__nesc_atomic_t oldSreg) @safe() {
   EA = oldSreg;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.