* device/lib/pic16/libsdcc/gptr/gptr*.c: added return statements

* device/include/pic16/stdio.h: fixed bug with colon

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3523 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 20ab886246a2be9de41eebd94fdd1958504456ac..2e440d923ca5d6a6915214c7d124bc2e5f215db1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-05 Vangelis Rokas <vrokas AT otenet.gr>
+
+       * device/lib/pic16/libsdcc/gptr/gptr*.c: added return statements
+       * device/include/pic16/stdio.h: fixed bug with colon
+

 2004-10-03 Vangelis Rokas <vrokas AT otenet.gr>
 
        * device/include/pic16/stdio.h,
 2004-10-03 Vangelis Rokas <vrokas AT otenet.gr>
 
        * device/include/pic16/stdio.h,

diff --git a/device/include/pic16/stdio.h b/device/include/pic16/stdio.h
index cd12f1758b4fa6d3cbf76d962f3f6479fa47a393..1444bca49ff4a9eb5ae0930649b81c39179aed53 100644 (file)
--- a/device/include/pic16/stdio.h
+++ b/device/include/pic16/stdio.h
@@ -50,7 +50,7 @@ extern int _print_format (pfn_outputchar pfn, void* pvoid, const char *format, v
 
 /*-----------------------------------------------------------------------*/
 
 
 /*-----------------------------------------------------------------------*/
 

-extern void printf_small (char *,...); _REENTRANT;
+extern void printf_small (char *,...) _REENTRANT;

 extern int printf (const char *,...);
 extern int vprintf (const char *, va_list);
 extern int sprintf (char *, const char *, ...);
 extern int printf (const char *,...);
 extern int vprintf (const char *, va_list);
 extern int sprintf (char *, const char *, ...);

diff --git a/device/lib/pic16/libsdcc/gptr/gptrget1.c b/device/lib/pic16/libsdcc/gptr/gptrget1.c
index 919c89e90ea96db9a75b8113b3d5e4e8fbc34a5a..cbf36b22b6033672e3ef89c3174d3d5d48d1bf0c 100644 (file)
--- a/device/lib/pic16/libsdcc/gptr/gptrget1.c
+++ b/device/lib/pic16/libsdcc/gptr/gptrget1.c
@@ -61,7 +61,7 @@ void _gptrget1(void) _naked
     /* debug info */
     movf       _POSTINC0, w
 
     /* debug info */
     movf       _POSTINC0, w
 

-    goto _end_
+    return

     
 
 _lab_01_:
     
 
 _lab_01_:


@@ -79,8 +79,7 @@ _lab_01_:
     /* result in TBLAT */
     movf       _TABLAT, w
     
     /* result in TBLAT */
     movf       _TABLAT, w
     

-    goto _end_
- 
+    return 

   
 _lab_02_:
     /* EEPROM pointer */
   
 _lab_02_:
     /* EEPROM pointer */


@@ -89,5 +88,6 @@ _lab_02_:
 
 _end_:
 
 
 _end_:
 

+  return

   _endasm;
 }
   _endasm;
 }

diff --git a/device/lib/pic16/libsdcc/gptr/gptrget2.c b/device/lib/pic16/libsdcc/gptr/gptrget2.c
index 6d4ca32130b380461b5682f174a9334811063f91..485fa4f358ad2fbc1ba43dd01efb1dd7d1d10643 100644 (file)
--- a/device/lib/pic16/libsdcc/gptr/gptrget2.c
+++ b/device/lib/pic16/libsdcc/gptr/gptrget2.c
@@ -61,7 +61,7 @@ void _gptrget2(void) _naked
     movf       _POSTINC0, w
     movff      _POSTINC0, _PRODL
     
     movf       _POSTINC0, w
     movff      _POSTINC0, _PRODL
     

-    goto _end_
+    return

     
 
 _lab_01_:
     
 
 _lab_01_:


@@ -82,7 +82,7 @@ _lab_01_:
     TBLRD*+
     movff      _TABLAT, _PRODL
     
     TBLRD*+
     movff      _TABLAT, _PRODL
     

-    goto _end_
+    return

  
   
 _lab_02_:
  
   
 _lab_02_:


@@ -92,5 +92,6 @@ _lab_02_:
 
 _end_:
 
 
 _end_:
 

+  return

   _endasm;
 }
   _endasm;
 }

diff --git a/device/lib/pic16/libsdcc/gptr/gptrget3.c b/device/lib/pic16/libsdcc/gptr/gptrget3.c
index 91387a321a09cf2eac32b8c249dd3a13d02bfa07..3b4eb25ab3173fb5767dece568b7b40308b34b98 100644 (file)
--- a/device/lib/pic16/libsdcc/gptr/gptrget3.c
+++ b/device/lib/pic16/libsdcc/gptr/gptrget3.c
@@ -63,7 +63,7 @@ void _gptrget3(void) _naked
     movff      _POSTINC0, _PRODL
     movff      _POSTINC0, _PRODH
     
     movff      _POSTINC0, _PRODL
     movff      _POSTINC0, _PRODH
     

-    goto _end_
+    return

     
 
 _lab_01_:
     
 
 _lab_01_:


@@ -88,7 +88,7 @@ _lab_01_:
     TBLRD*+
     movff      _TABLAT, _PRODH
     
     TBLRD*+
     movff      _TABLAT, _PRODH
     

-    goto _end_
+    return

  
   
 _lab_02_:
  
   
 _lab_02_:


@@ -96,7 +96,6 @@ _lab_02_:
 
     /* unimplemented yet */
 
 
     /* unimplemented yet */
 

-_end_:
-
+  return

   _endasm;
 }
   _endasm;
 }

diff --git a/device/lib/pic16/libsdcc/gptr/gptrget4.c b/device/lib/pic16/libsdcc/gptr/gptrget4.c
index f0721f8fabba7349d05e496af20a9352edc43b26..c57b9e5400816f5d06b58b6ba8fc89db2e10fa1a 100644 (file)
--- a/device/lib/pic16/libsdcc/gptr/gptrget4.c
+++ b/device/lib/pic16/libsdcc/gptr/gptrget4.c
@@ -64,7 +64,7 @@ void _gptrget4(void) _naked
     movff      _POSTINC0, _PRODH
     movff      _POSTINC0, _FSR0L
     
     movff      _POSTINC0, _PRODH
     movff      _POSTINC0, _FSR0L
     

-    goto _end_
+    return

     
 
 _lab_01_:
     
 
 _lab_01_:


@@ -93,15 +93,14 @@ _lab_01_:
     TBLRD*+
     movff      _TABLAT, _FSR0L
     
     TBLRD*+
     movff      _TABLAT, _FSR0L
     

-    goto _end_
- 
+    return 

   
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 
   
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 

-_end_:
-
+  return
+  

   _endasm;
 }
   _endasm;
 }

diff --git a/device/lib/pic16/libsdcc/gptr/gptrput1.c b/device/lib/pic16/libsdcc/gptr/gptrput1.c
index 79df3509f42230a87e6a58b0a5d09f0d54b49a21..decbadf6d9ed946a676a8acb6ca902fd6a7b16d0 100644 (file)
--- a/device/lib/pic16/libsdcc/gptr/gptrput1.c
+++ b/device/lib/pic16/libsdcc/gptr/gptrput1.c
@@ -60,25 +60,22 @@ void _gptrput1(void) _naked
     /* data are already in FSR0 */
     movff      _PRODL, _POSTINC0
     
     /* data are already in FSR0 */
     movff      _PRODL, _POSTINC0
     

-    goto _end_
+    return

     
 
 _lab_01_:
     /* code or eeprom */
     
 
 _lab_01_:
     /* code or eeprom */

-    btfsc      _WREG, 6
-    goto       _lab_02_
+    btfss      _WREG, 6
+    return

     
     /* code pointer, cannot write code pointers */
     
     
     /* code pointer, cannot write code pointers */
     

-    goto _end_
- 
-  

 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 

-_end_:

 
 

+  return

   _endasm;
 }
   _endasm;
 }

diff --git a/device/lib/pic16/libsdcc/gptr/gptrput2.c b/device/lib/pic16/libsdcc/gptr/gptrput2.c
index 80589c5efddaf2fa2ab0f78064b129042d4068e1..514a791448a28c397c17612702f9ba70a8d6986b 100644 (file)
--- a/device/lib/pic16/libsdcc/gptr/gptrput2.c
+++ b/device/lib/pic16/libsdcc/gptr/gptrput2.c
@@ -61,25 +61,23 @@ void _gptrput2(void) _naked
     movff      _PRODL, _POSTINC0
     movff      _PRODH, _POSTINC0
     
     movff      _PRODL, _POSTINC0
     movff      _PRODH, _POSTINC0
     

-    goto _end_
+    return

     
 
 _lab_01_:
     /* code or eeprom */
     
 
 _lab_01_:
     /* code or eeprom */

-    btfsc      _WREG, 6
-    goto       _lab_02_
+    btfss      _WREG, 6
+    return

     
     /* code pointer, cannot write code pointers */
     
     
     /* code pointer, cannot write code pointers */
     

-    goto _end_
- 

   
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 
   
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 

-_end_:

 
 

+  return

   _endasm;
 }
   _endasm;
 }

diff --git a/device/lib/pic16/libsdcc/gptr/gptrput3.c b/device/lib/pic16/libsdcc/gptr/gptrput3.c
index c699c8645b43919e21e26a4ded02ea8459efbace..d5eea4e646c9a01aeab0aba90691815992cf01d2 100644 (file)
--- a/device/lib/pic16/libsdcc/gptr/gptrput3.c
+++ b/device/lib/pic16/libsdcc/gptr/gptrput3.c
@@ -62,25 +62,23 @@ void _gptrput3(void) _naked
     movff      _PRODH, _POSTINC0
     movff      _TBLPTRL, _POSTINC0
     
     movff      _PRODH, _POSTINC0
     movff      _TBLPTRL, _POSTINC0
     

-    goto _end_
+    return

     
 
 _lab_01_:
     /* code or eeprom */
     
 
 _lab_01_:
     /* code or eeprom */

-    btfsc      _WREG, 6
-    goto       _lab_02_
+    btfss      _WREG, 6
+    return

     
     /* code pointer, cannot write code pointers */
     
     
     /* code pointer, cannot write code pointers */
     

-    goto _end_
- 

   
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 
   
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 

-_end_:

 
 

+  return

   _endasm;
 }
   _endasm;
 }

diff --git a/device/lib/pic16/libsdcc/gptr/gptrput4.c b/device/lib/pic16/libsdcc/gptr/gptrput4.c
index 6f0baaecb1da2f9aeb4632b6e6144dfe4aae9dc2..01b7db2b0b0bf1ca957cc0d030b988fb9dcb0b4a 100644 (file)
--- a/device/lib/pic16/libsdcc/gptr/gptrput4.c
+++ b/device/lib/pic16/libsdcc/gptr/gptrput4.c
@@ -63,25 +63,23 @@ void _gptrput4(void) _naked
     movff      _TBLPTRL, _POSTINC0
     movff      _TBLPTRH, _POSTINC0
     
     movff      _TBLPTRL, _POSTINC0
     movff      _TBLPTRH, _POSTINC0
     

-    goto _end_
+    return

     
 
 _lab_01_:
     /* code or eeprom */
     
 
 _lab_01_:
     /* code or eeprom */

-    btfsc      _WREG, 6
-    goto       _lab_02_
+    btfss      _WREG, 6
+    return

     
     /* code pointer, cannot write code pointers */
     
     
     /* code pointer, cannot write code pointers */
     

-    goto _end_
- 

   
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 
   
 _lab_02_:
     /* EEPROM pointer */
 
     /* unimplemented yet */
 

-_end_:

 
 

+  return

   _endasm;
 }
   _endasm;
 }