* debugger/mcs51/break.c: bugfix from patch 1989966, thanks Risto Huotari

[fw/sdcc] / device / lib / _gptrput.c

diff --git a/device/lib/_gptrput.c b/device/lib/_gptrput.c
index fe30a84591cd9f8fa58668a50a08e809c2d8b1c1..61123537d40c3b1c9ce7abf6f8341d5673aac0b1 100644 (file)
--- a/device/lib/_gptrput.c
+++ b/device/lib/_gptrput.c
@@ -36,14 +36,14 @@ __sbit __at (0xF5) B_5;
 
 #if defined DSDCC_MODEL_HUGE
 void
-_gptrput (char *gptr, char c) _naked
+_gptrput (char *gptr, char c) __naked
 {
 /* This is the banked version with pointers up to 22 bits.
    B cannot be trashed */
 
     gptr; c; /* hush the compiler */
 
-    _asm
+    __asm
     ;
     ;   depending on the pointer type according to SDCCsymt.h
     ;
@@ -70,9 +70,6 @@ _gptrput (char *gptr, char c) _naked
  pdataptr$:
         movx    @r0,a                                   ; 1
         sjmp    dataptrrestore$                         ; 2
-        mov     r0,dph ; restore r0                     ; 2
-        mov     dph,#0 ; restore dph                    ; 2
-        ret                                             ; 1
     ;
     ;   store into far space
     ;
@@ -84,20 +81,20 @@ _gptrput (char *gptr, char c) _naked
 
                                                         ;===
                                                         ;27 bytes
-_endasm;
+    __endasm;
 }
 
 #elif defined DSDCC_MODEL_MEDIUM
 
 void
-_gptrput (char *gptr, char c) _naked
+_gptrput (char *gptr, char c) __naked
 {
 /* This is the non-banked version with pointers up to 14 bits.
    Assumes B is free to be used */
 
     gptr; c; /* hush the compiler */
 
-    _asm
+    __asm
     ;
     ;   depending on the pointer type according to SDCCsymt.h
     ;
@@ -133,20 +130,20 @@ _gptrput (char *gptr, char c) _naked
         ret                                             ; 1
                                                         ;===
                                                         ;25 bytes
-    _endasm;
+    __endasm;
 }
 
-#elif 1
+#else
 
 void
-_gptrput (char *gptr, char c) _naked
+_gptrput (char *gptr, char c) __naked
 {
 /* This is the new version with pointers up to 16 bits.
    B cannot be trashed */
 
     gptr; c; /* hush the compiler */
 
-    _asm
+    __asm
     ;
     ;   depending on the pointer type according to SDCCsymt.h
     ;
@@ -182,82 +179,17 @@ _gptrput (char *gptr, char c) _naked
 
                                                         ;===
                                                         ;24 bytes
-_endasm;
+    __endasm;
 }
 
-#else
-
-void
-_gptrput (char *gptr, char c) _naked
-{
-/* This is the old version with pointers up to 16 bits. */
-
-    gptr; c; /* hush the compiler */
-
-    _asm
-        ar0 = 0x00
-        push     acc                                    ; 2
-    ;
-    ;   depending on the pointer type acc. to SDCCsymt.h
-    ;
-        mov     a,b                                     ; 2
-        jz      00001$  ; 0 near                        ; 2
-        dec     a                                       ; 1
-        jz      00002$  ; 1 far                         ; 2
-        dec     a                                       ; 1
-        jz      00003$  ; 2 code                        ; 2
-        dec     a                                       ; 1
-        jz      00004$  ; 3 pdata                       ; 2
-        dec     a       ; 4 skip generic pointer        ; 1
-        dec     a                                       ; 1
-        jz      00001$  ; 5 idata                       ; 2
-
- 00003$:
-        pop     acc    ; do nothing                     ; 2
-        ret                                             ; 1
-;
-;       store into near space
-;
- 00001$:
-        pop     acc                                     ; 2
-        push    ar0                                     ; 2
-        mov     r0,dpl                                  ; 2
-        mov     @r0,a                                   ; 1
-        pop     ar0                                     ; 2
-        ret                                             ; 1
-
- 00002$:
-        pop     acc                                     ; 2
-        movx    @dptr,a                                 ; 1
-        ret                                             ; 1
-
- 00004$:
-#if USE_PDATA_PAGING_REGISTER
-        pop     acc
-        mov     dph,__XPAGE     ; __XPAGE (usually p2) holds high byte for pdata access
-        movx    @dptr,a
-#else
-        pop     acc                                     ; 2
-        push    ar0                                     ; 2
-        mov     r0,dpl                                  ; 2
-        movx    @r0,a                                   ; 1
-        pop     ar0                                     ; 2
-#endif
-        ret                                             ; 1
-                                                        ;===
-                                                        ;46 bytes
-_endasm;
-}
 #endif
 
 #ifdef SDCC_ds390
 
-#if 1
-
 void
 _gptrputWord ()
 {
-    _asm
+    __asm
     ;
     ;   depending on the pointer type acc. to SDCCsymt.h
     ;
@@ -305,71 +237,7 @@ _gptrputWord ()
         mov     r0,dph ; restore r0
         mov     dph,#0 ; restore dph
  00016$:
-    _endasm;
-}
-
-#else
-
-void
-_gptrputWord ()
-{
-    _asm
-        push     acc
-    ;
-    ;   depending on the pointer type acc. to SDCCsymt.h
-    ;
-        mov     a,b
-        jz      00011$  ; 0 near
-        dec     a
-        jz      00012$  ; 1 far
-        dec     a
-        jz      00013$  ; 2 code
-        dec     a
-        jz      00014$  ; 3 pdata
-        dec     a       ; 4 skip generic pointer
-        dec     a
-        jz      00011$  ; 5 idata
-        pop     acc
-        sjmp    00016$
-;
-;       store into near space
-;
- 00011$:
-        pop     acc
-        push    ar0
-        mov     r0,dpl
-        mov     @r0,_ap
-        inc     r0
-        mov     @r0,a
-        sjmp    00015$
-
- 00012$:
-        mov     a, _ap
-        movx    @dptr,a
-        inc     dptr
-        pop     acc
-        movx    @dptr,a
-        sjmp    00016$
-
- 00013$:
-        pop     acc    ; do nothing
-        sjmp    00016$
-
- 00014$:
-        pop     acc
-        push    ar0
-        mov     r0,dpl
-        xch     a,_ap
-        movx    @r0,a
-        inc     r0
-        xch     a,_ap
-        movx    @r0, a
- 00015$:
-        inc     dptr
-        pop     ar0
- 00016$:
-    _endasm;
+    __endasm;
 }
-#endif
 
 #endif