+2008-05-26 Raphael Neider <rneider AT web.de>
+
+ * device/lib/pic16/startup/crt0.c,
+ * device/lib/pic16/startup/crt0i.c,
+ * device/lib/pic16/startup/crt0iz.c: clean up, make use of access bank
+ explicit, fixed curr_entry loop for >= 256 initializer records,
+ removed debug code (write to 0xf7e)
+
2008-05-25 Raphael Neider <rneider AT web.de>
* device/include/pic/pic16f627a.h,
* 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.
- *
+ *
* This program 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 this program; if not, write to the Free Software
* Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ *
* In other words, you are welcome to use, share and improve this program.
* You are forbidden to forbid anyone else to use, share and improve
- * what you give them. Help stamp out software-hoarding!
+ * what you give them. Help stamp out software-hoarding!
*
* $Id$
*/
-extern stack;
extern stack_end;
-
extern TBLPTRU;
/* external reference to the user's main routine */
extern void main (void);
-/* prototype for the startup function */
void _entry (void) __naked __interrupt 0;
void _startup (void) __naked;
+/* Access bank selector. */
+#define a 0
+
/*
* entry function, placed at interrupt vector 0 (RESET)
*/
-
void _entry (void) __naked __interrupt 0
{
- __asm goto __startup __endasm;
+ __asm
+ goto __startup
+ __endasm;
}
-
void _startup (void) __naked
{
__asm
- // Initialize the stack pointer
- lfsr 1, _stack_end
- lfsr 2, _stack_end
- clrf _TBLPTRU, 0 // 1st silicon doesn't do this on POR
-
- // initialize the flash memory access configuration. this is harmless
- // for non-flash devices, so we do it on all parts.
- bsf 0xa6, 7, 0
- bcf 0xa6, 6, 0
+ ; Initialize the stack pointer
+ lfsr 1, _stack_end
+ lfsr 2, _stack_end
+
+ ; 1st silicon does not do this on POR
+ clrf _TBLPTRU, a
- __endasm ;
-
- /* Call the user's main routine */
+ ; Initialize the flash memory access configuration.
+ ; This is harmless for non-flash devices, so we do it on all parts.
+ bsf 0xa6, 7, a ; EECON1.EEPGD = 1, TBLPTR accesses program memory
+ bcf 0xa6, 6, a ; EECON1.CFGS = 0, TBLPTR accesses program memory
+ __endasm;
+
+ /* Call the main routine. */
main();
-loop:
- /* return from main will lock up */
- goto loop;
+ __asm
+lockup:
+ ; Returning from main will lock up.
+ bra lockup
+ __endasm;
}
* 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.
- *
+ *
* This program 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 this program; if not, write to the Free Software
* Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ *
* In other words, you are welcome to use, share and improve this program.
* You are forbidden to forbid anyone else to use, share and improve
- * what you give them. Help stamp out software-hoarding!
+ * what you give them. Help stamp out software-hoarding!
*
* $Id$
*/
-extern stack;
extern stack_end;
-
extern TBLPTRU;
extern TBLPTRH;
extern TBLPTRL;
/* external reference to the user's main routine */
extern void main (void);
-/* prototype for the startup function */
void _entry (void) __naked __interrupt 0;
void _startup (void) __naked;
-
-/* prototype for the initialized data setup */
void _do_cinit (void) __naked;
+/* Access bank selector. */
+#define a 0
+
/*
* entry function, placed at interrupt vector 0 (RESET)
*/
-
void _entry (void) __naked __interrupt 0
{
- __asm goto __startup __endasm;
+ __asm
+ goto __startup
+ __endasm;
}
-
void _startup (void) __naked
{
__asm
- // Initialize the stack pointer
- lfsr 1, _stack_end
- lfsr 2, _stack_end
- clrf _TBLPTRU, 0 // 1st silicon doesn't do this on POR
-
- // initialize the flash memory access configuration. this is harmless
- // for non-flash devices, so we do it on all parts.
- bsf 0xa6, 7, 0
- bcf 0xa6, 6, 0
-
- __endasm ;
-
+ ; Initialize the stack pointer
+ lfsr 1, _stack_end
+ lfsr 2, _stack_end
+
+ ; 1st silicon does not do this on POR
+ clrf _TBLPTRU, a
+
+ ; Initialize the flash memory access configuration.
+ ; This is harmless for non-flash devices, so we do it on all parts.
+ bsf 0xa6, 7, a ; EECON1.EEPGD = 1, TBLPTR accesses program memory
+ bcf 0xa6, 6, a ; EECON1.CFGS = 0, TBLPTR accesses program memory
+ __endasm;
+
+ /* Initialize global and/or static variables. */
_do_cinit();
- /* Call the user's main routine */
+ /* Call the main routine. */
main();
-loop:
- /* return from main will lock up */
- goto loop;
+ __asm
+lockup:
+ ; Returning from main will lock up.
+ bra lockup
+ __endasm;
}
/* the cinit table will be filled by the linker */
-extern __code struct
-{
+extern __code struct {
unsigned short num_init;
- struct _init_entry {
+ struct {
unsigned long from;
unsigned long to;
unsigned long size;
- } entries[];
+ } entries[1];
} cinit;
#define curr_entry 0x05 /* 0x05 0x06 */
#define data_ptr 0x07 /* 0x07 0x08 0x09 */
-/*
- * static short long _do_cinit_prom;
- * static unsigned short _do_cinit_curr_byte;
- * static unsigned short _do_cinit_curr_entry;
- * static short long _do_cinit_data_ptr;
- */
-
/* the variable initialisation routine */
void _do_cinit (void) __naked
{
* access registers 0x00 - 0x09 are not saved in this function
*/
__asm
- ; TBLPTR = &cinit
- movlw low(_cinit)
- movwf _TBLPTRL
- movlw high(_cinit)
- movwf _TBLPTRH
- movlw upper(_cinit)
- movwf _TBLPTRU
-
- ; curr_entry = cinit.num_init
- ; movlb data_ptr
+ ; TBLPTR = &cinit
+ movlw low(_cinit)
+ movwf _TBLPTRL, a
+ movlw high(_cinit)
+ movwf _TBLPTRH, a
+ movlw upper(_cinit)
+ movwf _TBLPTRU, a
+
+ ; curr_entry = cinit.num_init
TBLRDPOSTINC
- movf _TABLAT, w
- movwf curr_entry
+ movf _TABLAT, w, a
+ movwf curr_entry, a
TBLRDPOSTINC
- movf _TABLAT, w
- movwf curr_entry+1
+ movf _TABLAT, w, a
+ movwf curr_entry + 1, a
- ; while (curr_entry) {
+ ; while (curr_entry)
+ movf curr_entry, w, a
test:
- bnz cont1 ;;done1
- tstfsz curr_entry, 1
- bra cont1
-
-done1:
- goto done
+ bnz cont1
+ movf curr_entry + 1, w, a
+ bz done
cont1:
+ ; Count down so we only have to look up the data in _cinit once.
- ; Count down so we only have to look up the data in _cinit once.
+ ; At this point we know that TBLPTR points to the top of the current
+ ; entry in _cinit, so we can just start reading the from, to, and
+ ; size values.
- ; At this point we know that TBLPTR points to the top of the current
- ; entry in _cinit, so we can just start reading the from, to, and
- ; size values.
-
- ; read the source address low
- TBLRDPOSTINC
- movf _TABLAT, w
- movwf prom
-
- ; source address high
+ ; read the source address low
TBLRDPOSTINC
- movf _TABLAT, w
- movwf prom + 1
+ movf _TABLAT, w, a
+ movwf prom, a
- ; source address upper
+ ; source address high
TBLRDPOSTINC
- movf _TABLAT, w
- movwf prom + 2
+ movf _TABLAT, w, a
+ movwf prom + 1, a
- ; skip a byte since it is stored as a 32bit int
+ ; source address upper
TBLRDPOSTINC
+ movf _TABLAT, w, a
+ movwf prom + 2, a
- ; read the destination address directly into FSR0
- ; destination address low
+ ; skip a byte since it is stored as a 32bit int
TBLRDPOSTINC
- movf _TABLAT, w
- movwf _FSR0L
- ; destination address high
+ ; read the destination address directly into FSR0
+ ; destination address low
TBLRDPOSTINC
- movf _TABLAT, w
- movwf _FSR0H
+ movf _TABLAT, w, a
+ movwf _FSR0L, a
- ; skip two bytes since it is stored as a 32bit int
- TBLRDPOSTINC
+ ; destination address high
TBLRDPOSTINC
+ movf _TABLAT, w, a
+ movwf _FSR0H, a
- ; read the size of data to transfer destination address
- TBLRDPOSTINC
- movf _TABLAT, w
- movwf curr_byte
-
- TBLRDPOSTINC
- movf _TABLAT, w
- movwf curr_byte+1
-
- ; skip two bytes since it is stored as a 32bit int
+ ; skip two bytes since it is stored as a 32bit int
TBLRDPOSTINC
TBLRDPOSTINC
- ; prom = data_ptr->from;
- ; FSR0 = data_ptr->to;
- ; curr_byte = (unsigned short) data_ptr->size;
-
- ; the table pointer now points to the next entry. Save it
- ; off since we will be using the table pointer to do the copying
- ; for the entry
-
- ; data_ptr = TBLPTR
-
- movff _TBLPTRL, data_ptr
- movff _TBLPTRH, data_ptr + 1
- movff _TBLPTRU, data_ptr + 2
-
- ; now assign the source address to the table pointer
- ; TBLPTR = prom
-
- movff prom, _TBLPTRL
- movff prom + 1, _TBLPTRH
- movff prom + 2, _TBLPTRU
-
- ; do the copy loop
-
- ; determine if we have any more bytes to copy
- ; movlb curr_byte
-
- movf curr_byte, w
-copy_loop:
- bnz copy_one_byte ; copy_one_byte
- movf curr_byte + 1, w
- bz done_copying
+ ; read the size of data to transfer to destination address
+ TBLRDPOSTINC
+ movf _TABLAT, w, a
+ movwf curr_byte, a
-copy_one_byte:
TBLRDPOSTINC
- movf _TABLAT, w
- movwf _POSTINC0
+ movf _TABLAT, w, a
+ movwf curr_byte + 1, a
- movff _TABLAT, 0xf7e
+ ; skip two bytes since it is stored as a 32bit int
+ TBLRDPOSTINC
+ TBLRDPOSTINC
- ; decrement byte counter
- decf curr_byte, f
- bc copy_loop ; copy_loop
- decf curr_byte + 1, f
- bra copy_one_byte
+ ; prom = data_ptr->from;
+ ; FSR0 = data_ptr->to;
+ ; curr_byte = (unsigned short) data_ptr->size;
-done_copying:
+ ; the table pointer now points to the next entry. Save it
+ ; off since we will be using the table pointer to do the copying
+ ; for the entry
-
- ; restore the table pointer for the next entry
- ; TBLPTR = data_ptr
- movff data_ptr, _TBLPTRL
- movff data_ptr + 1, _TBLPTRH
- movff data_ptr + 2, _TBLPTRU
+ ; data_ptr = TBLPTR
+ movff _TBLPTRL, data_ptr
+ movff _TBLPTRH, data_ptr + 1
+ movff _TBLPTRU, data_ptr + 2
- decf curr_entry, f
- bc do_next
- decf curr_entry + 1, f
+ ; now assign the source address to the table pointer
+ ; TBLPTR = prom
+ movff prom, _TBLPTRL
+ movff prom + 1, _TBLPTRH
+ movff prom + 2, _TBLPTRU
-do_next:
+ ; while (curr_byte)
+ movf curr_byte, w, a
+copy_loop:
+ bnz copy_one_byte
+ movf curr_byte + 1, w, a
+ bz done_copying
- ; next entry...
- ; _do_cinit_curr_entry--;
+copy_one_byte:
+ TBLRDPOSTINC
+ movf _TABLAT, w, a
+ movwf _POSTINC0, a
- goto test;
+ ; decrement byte counter
+ decf curr_byte, f, a
+ bc copy_loop
+ decf curr_byte + 1, f, a
+ bra copy_one_byte
- ; emit done label
+done_copying:
+ ; restore the table pointer for the next entry
+ ; TBLPTR = data_ptr
+ movff data_ptr, _TBLPTRL
+ movff data_ptr + 1, _TBLPTRH
+ movff data_ptr + 2, _TBLPTRU
+
+ ; decrement entry counter
+ decf curr_entry, f, a
+ bc test
+ decf curr_entry + 1, f, a
+ bra cont1
+
+ ; emit done label
done:
return
__endasm;
/*
* crt0iz.c - SDCC pic16 port runtime start code with
- * initialisation and RAM memory zero
+ * initialisation and clear RAM
*
* Converted for SDCC and pic16 port
* by Vangelis Rokas (vrokas@otenet.gr)
* 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.
- *
+ *
* This program 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 this program; if not, write to the Free Software
* Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
+ *
* In other words, you are welcome to use, share and improve this program.
* You are forbidden to forbid anyone else to use, share and improve
- * what you give them. Help stamp out software-hoarding!
+ * what you give them. Help stamp out software-hoarding!
*
* $Id$
*/
-extern stack;
extern stack_end;
-
extern TBLPTRU;
extern TBLPTRH;
extern TBLPTRL;
/* external reference to the user's main routine */
extern void main (void);
-/* prototype for the startup function */
void _entry (void) __naked __interrupt 0;
void _startup (void) __naked;
-
-/* prototype for the initialized data setup */
void _do_cinit (void) __naked;
+/* Access bank selector. */
+#define a 0
+
/*
* entry function, placed at interrupt vector 0 (RESET)
*/
-
void _entry (void) __naked __interrupt 0
{
- __asm goto __startup __endasm;
+ __asm
+ goto __startup
+ __endasm;
}
-
void _startup (void) __naked
{
__asm
- // Initialize the stack pointer
- lfsr 1, _stack_end
- lfsr 2, _stack_end
- clrf _TBLPTRU, 0 // 1st silicon doesn't do this on POR
-
- // initialize the flash memory access configuration. this is harmless
- // for non-flash devices, so we do it on all parts.
- bsf 0xa6, 7, 0
- bcf 0xa6, 6, 0
- __endasm ;
-
+ ; Initialize the stack pointer
+ lfsr 1, _stack_end
+ lfsr 2, _stack_end
+
+ ; 1st silicon does not do this on POR
+ clrf _TBLPTRU, a
+
+ ; Initialize the flash memory access configuration.
+ ; This is harmless for non-flash devices, so we do it on all parts.
+ bsf 0xa6, 7, a ; EECON1.EEPGD = 1, TBLPTR accesses program memory
+ bcf 0xa6, 6, a ; EECON1.CFGS = 0, TBLPTR accesses program memory
+ __endasm;
+
/* cleanup the RAM */
__asm
- /* load FSR0 with top of RAM memory */
- ; movlw 0xff
- ; movwf _FSR0L, 0
- setf _FSR0L
- movlw 0x0e
- movwf _FSR0H, 0
-
- /* place a 1 at address 0x00, as a marker
- * we haven't reached yet to it */
- ; movlw 1
- ; movwf 0x00, 0
- setf 0x00
-
- /* load WREG with zero */
- movlw 0x00
-
+ ; Load FSR0 with top of RAM.
+ setf _FSR0L, a
+ movlw 0x0e
+ movwf _FSR0H, a
+
+ ; Place 0xff at address 0x00 as a sentinel.
+ setf 0x00, a
+
clear_loop:
- clrf _POSTDEC0
- movf 0x00, w
- bnz clear_loop
- __endasm ;
+ clrf _POSTDEC0, a
+ movf 0x00, w, a
+ bnz clear_loop
+ __endasm;
+ /* Initialize global and/or static variables. */
_do_cinit();
- /* Call the user's main routine */
+ /* Call the main routine. */
main();
-loop:
- /* return from main will lock up */
- goto loop;
+ __asm
+lockup:
+ ; Returning from main will lock up.
+ bra lockup
+ __endasm;
}
/* the cinit table will be filled by the linker */
-extern __code struct
-{
+extern __code struct {
unsigned short num_init;
- struct _init_entry {
+ struct {
unsigned long from;
unsigned long to;
unsigned long size;
- } entries[];
+ } entries[1];
} cinit;
#define curr_entry 0x05 /* 0x05 0x06 */
#define data_ptr 0x07 /* 0x07 0x08 0x09 */
-/*
- * static short long _do_cinit_prom;
- * static unsigned short _do_cinit_curr_byte;
- * static unsigned short _do_cinit_curr_entry;
- * static short long _do_cinit_data_ptr;
- */
-
/* the variable initialisation routine */
void _do_cinit (void) __naked
{
/*
* access registers 0x00 - 0x09 are not saved in this function
*/
-
__asm
- ; TBLPTR = &cinit
- movlw low(_cinit)
- movwf _TBLPTRL
- movlw high(_cinit)
- movwf _TBLPTRH
- movlw upper(_cinit)
- movwf _TBLPTRU
-
- ; curr_entry = cinit.num_init
- ; movlb data_ptr
+ ; TBLPTR = &cinit
+ movlw low(_cinit)
+ movwf _TBLPTRL, a
+ movlw high(_cinit)
+ movwf _TBLPTRH, a
+ movlw upper(_cinit)
+ movwf _TBLPTRU, a
+
+ ; curr_entry = cinit.num_init
TBLRDPOSTINC
- movf _TABLAT, w
- movwf curr_entry
+ movf _TABLAT, w, a
+ movwf curr_entry, a
TBLRDPOSTINC
- movf _TABLAT, w
- movwf curr_entry+1
+ movf _TABLAT, w, a
+ movwf curr_entry + 1, a
- ; while (curr_entry) {
+ ; while (curr_entry)
+ movf curr_entry, w, a
test:
- bnz cont1 ;;done1
- tstfsz curr_entry, 1
- bra cont1
-
-done1:
- goto done
+ bnz cont1
+ movf curr_entry + 1, w, a
+ bz done
cont1:
+ ; Count down so we only have to look up the data in _cinit once.
- ; Count down so we only have to look up the data in _cinit once.
-
- ; At this point we know that TBLPTR points to the top of the current
- ; entry in _cinit, so we can just start reading the from, to, and
- ; size values.
+ ; At this point we know that TBLPTR points to the top of the current
+ ; entry in _cinit, so we can just start reading the from, to, and
+ ; size values.
- ; read the source address low
+ ; read the source address low
TBLRDPOSTINC
- movf _TABLAT, w
- movwf prom
-
- ; source address high
+ movf _TABLAT, w, a
+ movwf prom, a
+
+ ; source address high
TBLRDPOSTINC
- movf _TABLAT, w
- movwf prom + 1
+ movf _TABLAT, w, a
+ movwf prom + 1, a
- ; source address upper
+ ; source address upper
TBLRDPOSTINC
- movf _TABLAT, w
- movwf prom + 2
+ movf _TABLAT, w, a
+ movwf prom + 2, a
- ; skip a byte since it is stored as a 32bit int
+ ; skip a byte since it is stored as a 32bit int
TBLRDPOSTINC
- ; read the destination address directly into FSR0
- ; destination address low
+ ; read the destination address directly into FSR0
+ ; destination address low
TBLRDPOSTINC
- movf _TABLAT, w
- movwf _FSR0L
+ movf _TABLAT, w, a
+ movwf _FSR0L, a
- ; destination address high
+ ; destination address high
TBLRDPOSTINC
- movf _TABLAT, w
- movwf _FSR0H
+ movf _TABLAT, w, a
+ movwf _FSR0H, a
- ; skip two bytes since it is stored as a 32bit int
+ ; skip two bytes since it is stored as a 32bit int
TBLRDPOSTINC
TBLRDPOSTINC
- ; read the size of data to transfer to destination address
+ ; read the size of data to transfer to destination address
TBLRDPOSTINC
- movf _TABLAT, w
- movwf curr_byte
-
+ movf _TABLAT, w, a
+ movwf curr_byte, a
+
TBLRDPOSTINC
- movf _TABLAT, w
- movwf curr_byte+1
-
+ movf _TABLAT, w, a
+ movwf curr_byte + 1, a
- ; skip two bytes since it is stored as a 32bit int
+ ; skip two bytes since it is stored as a 32bit int
TBLRDPOSTINC
TBLRDPOSTINC
- ; prom = data_ptr->from;
- ; FSR0 = data_ptr->to;
- ; curr_byte = (unsigned short) data_ptr->size;
-
- ; the table pointer now points to the next entry. Save it
- ; off since we will be using the table pointer to do the copying
- ; for the entry
-
- ; data_ptr = TBLPTR
-
- movff _TBLPTRL, data_ptr
- movff _TBLPTRH, data_ptr + 1
- movff _TBLPTRU, data_ptr + 2
-
- ; now assign the source address to the table pointer
- ; TBLPTR = prom
-
- movff prom, _TBLPTRL
- movff prom + 1, _TBLPTRH
- movff prom + 2, _TBLPTRU
-
- ; do the copy loop
-
- ; determine if we have any more bytes to copy
- ; movlb curr_byte
- movf curr_byte, w
+ ; prom = data_ptr->from;
+ ; FSR0 = data_ptr->to;
+ ; curr_byte = (unsigned short) data_ptr->size;
+ ; the table pointer now points to the next entry. Save it
+ ; off since we will be using the table pointer to do the copying
+ ; for the entry
+
+ ; data_ptr = TBLPTR
+ movff _TBLPTRL, data_ptr
+ movff _TBLPTRH, data_ptr + 1
+ movff _TBLPTRU, data_ptr + 2
+
+ ; now assign the source address to the table pointer
+ ; TBLPTR = prom
+ movff prom, _TBLPTRL
+ movff prom + 1, _TBLPTRH
+ movff prom + 2, _TBLPTRU
+
+ ; while (curr_byte)
+ movf curr_byte, w, a
copy_loop:
- bnz copy_one_byte ; copy_one_byte
- movf curr_byte + 1, w
- bz done_copying
+ bnz copy_one_byte
+ movf curr_byte + 1, w, a
+ bz done_copying
copy_one_byte:
TBLRDPOSTINC
- movf _TABLAT, w
- movwf _POSTINC0
+ movf _TABLAT, w, a
+ movwf _POSTINC0, a
- ; decrement byte counter
- decf curr_byte, f
- bc copy_loop ; copy_loop
- decf curr_byte + 1, f
+ ; decrement byte counter
+ decf curr_byte, f, a
+ bc copy_loop
+ decf curr_byte + 1, f, a
+ bra copy_one_byte
- bra copy_one_byte
done_copying:
-
-
- ; restore the table pointer for the next entry
- ; TBLPTR = data_ptr
- movff data_ptr, _TBLPTRL
- movff data_ptr + 1, _TBLPTRH
- movff data_ptr + 2, _TBLPTRU
-
-
- decf curr_entry, f
- bc do_next
- decf curr_entry + 1, f
-
-do_next:
- ; next entry...
- ; _do_cinit_curr_entry--;
-
- goto test;
-
- ; emit done label
+ ; restore the table pointer for the next entry
+ ; TBLPTR = data_ptr
+ movff data_ptr, _TBLPTRL
+ movff data_ptr + 1, _TBLPTRH
+ movff data_ptr + 2, _TBLPTRU
+
+ ; decrement entry counter
+ decf curr_entry, f, a
+ bc test
+ decf curr_entry + 1, f, a
+ bra cont1
+
+ ; emit done label
done:
return
__endasm;
projects / fw / sdcc / commitdiff