SVN --> GIT

[avrcpm.git] / avr / macros.inc

diff --git a/avr/macros.inc b/avr/macros.inc
index 03360c6a466115795d8c280928647df871cdab18..7d14839a3afd050c92c0140e609a2f2295e35c8d 100644 (file)
--- a/avr/macros.inc
+++ b/avr/macros.inc
@@ -1,6 +1,6 @@
 ;    Commonly used macros
 ;
-;    Copyright (C) 2010 Leo C.
+;    Copyright (C) 2010,2012,2013 Leo C.
 ;
 ;    This file is part of avrcpm.
 ;
@@ -17,11 +17,11 @@
 ;    You should have received a copy of the GNU General Public License
 ;    along with avrcpm.  If not, see <http://www.gnu.org/licenses/>.
 ;
-;    $Id$
+;    $Id: macros.inc 241 2015-12-10 09:38:25Z rapid $
 ;
 
 ;------------------------------------------------
-; 
+;
 .macro outm8
 .if    @0 > 0x3f
        sts     @0,@1
@@ -31,7 +31,7 @@
 .endm
 
 ;------------------------------------------------
-; 
+;
 .macro inm8
 .if    @1 > 0x3f
        lds     @0,@1
@@ -41,7 +41,7 @@
 .endm
 
 ;------------------------------------------------
-; 
+;
 .macro sbism8
 .if    @0 > 0x1f
        in      _tmp0,@0
@@ -55,7 +55,7 @@
 ; load 16 bit constant to register pair
 
 .macro ldiw
-       ldi    @0l, low(@1)  
+       ldi    @0l, low(@1)
        ldi    @0h, high(@1)
 .endm
 
@@ -63,7 +63,7 @@
 ; load 16 bit direct from data space
 
 .macro ldsw
-       lds    @0l, @1 
+       lds    @0l, @1
        lds    @0h, @1+1
 .endm
 
@@ -71,7 +71,7 @@
 ; store 16 bit direct to data space
 
 .macro stsw
-       sts    @0,  @1l 
+       sts    @0,  @1l
        sts    @0+1,@1h
 .endm
 
@@ -79,7 +79,7 @@
 ; add 16 bit constant to register pair
 
 .macro addiw
-       subi    @0l, low(-@1)  
+       subi    @0l, low(-@1)
        sbci    @0h, high(-@1)
 .endm
 
@@ -87,7 +87,7 @@
 ; sub 16 bit constant from register pair
 
 .macro subiw
-       subi    @0l, low(@1)  
+       subi    @0l, low(@1)
        sbci    @0h, high(@1)
 .endm
 
@@ -102,23 +102,64 @@
 .endm
 
 ;------------------------------------------------
-; 
+;
 ;
 ;
 .macro  INTERRUPT
-  .set pos_ = PC
-  .org @0                      ; vector address
-  .if abs(pos_ - PC) > 2048
-       jmp     pos_
+  .set pos_ = PC               ;save current position
+  .org @0                      ;vector address
+  .set dist_ = pos_ - (PC+1)
+
+  .if  dist_ <= 2048
+       rjmp     pos_
+  .elif (dist_ - (FLASHEND+1)) > -2048
+       .set disp_ = (dist_ - (FLASHEND+1)) & 0xFFF
+;      rjmp    pos_ - (FLASHEND+1)
+       .dw     0xC000 | disp_
   .else
-       rjmp    pos_            ; jump to handler
+       jmp    pos_             ;jump to handler
   .endif
-  .org pos_                    ; restore PC
+
+  .org pos_                    ;restore PC
 .endm
 
 ;------------------------------------------------
-; 
 ;
+;
+
+#if 1
+
+.macro  ljmp
+  .if FLASHEND > 0x0fff
+    .ifdef @0
+      .set dist_ = @0 - (PC+1)
+      .if dist_ < 0
+        .if dist_ >= -2048
+         rjmp  @0
+        .elif dist_ < -(FLASHEND+1-2048)
+         .dw   0xC000 | (dist_ + (FLASHEND+1)) & 0xFFF
+       .else
+         jmp   @0
+       .endif
+      .else                    ; >0
+       .if (dist_ < 2048)
+         rjmp  @0
+        .elif dist_ > (FLASHEND+1-2048)
+         .dw   0xC000 | (dist_ - (FLASHEND+1)) & 0xFFF
+       .else
+         jmp   @0
+       .endif
+      .endif
+    .else                      ; not def @0
+       jmp     @0
+    .endif
+  .else                                ; <= 0x0fff
+       rjmp    @0
+  .endif
+.endm
+
+#else
+
 .macro  ljmp
   .if FLASHEND > 0x0fff
     .ifdef @0
@@ -134,6 +175,7 @@
        rjmp    @0
   .endif
 .endm
+#endif
 
 ;------------------------------------------------
 ;
@@ -141,29 +183,50 @@
 .macro  lcall
   .if FLASHEND > 0x0fff
     .ifdef @0
-      .if abs(PC - @0) > 2047
-       call    @0
-      .else
-       rcall   @0
+      .set dist_ = @0 - (PC+1)
+      .if dist_ < 0
+        .if dist_ >= -2048
+         rcall @0
+        .elif dist_ < -(FLASHEND+1-2048)
+         .dw   0xC000 | (dist_ + (FLASHEND+1)) & 0xFFF
+       .else
+         call  @0
+       .endif
+      .else                    ; >0
+       .if (dist_ < 2048)
+         rcall @0
+        .elif dist_ > (FLASHEND+1-2048)
+         .dw   0xC000 | (dist_ - (FLASHEND+1)) & 0xFFF
+       .else
+         call  @0
+       .endif
       .endif
-    .else
+    .else                      ; not def @0
        call    @0
     .endif
-  .else
+  .else                                ; <= 0x0fff
        rcall   @0
   .endif
 .endm
 
+;------------------------------------------------
+; Make string.
+;      makestring "String"
+
+.macro makestring
+  .if strlen(@0) % 2
+    .db @0,0
+  .else
+    .db @0,0,0
+  .endif
+.endm
+
 ;------------------------------------------------
 ; Print string.
 ;      printstring "String"
 
 .macro printstring
-  .if FLASHEND > 0x0fff
-       call    printstr
-  .else
-       rcall   printstr
-  .endif
+  lcall        printstr
   .if strlen(@0) % 2
     .db @0,0
   .else
@@ -227,4 +290,3 @@
 .endm
 
 ; vim:set ts=8 noet nowrap
-