From e32d5a4a4b6d5c249c0a7a886c5512a41318ea11 Mon Sep 17 00:00:00 2001 From: cuz Date: Sat, 10 Mar 2001 14:19:21 +0000 Subject: [PATCH] Use the linker define stacksize instead of a variable. git-svn-id: svn://svn.cc65.org/cc65/trunk@621 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/common/Makefile | 43 ++++++++++++++++++++++++++++++++-------- libsrc/common/_heap.s | 6 +++--- libsrc/common/_stksize.s | 15 -------------- 3 files changed, 38 insertions(+), 26 deletions(-) delete mode 100644 libsrc/common/_stksize.s diff --git a/libsrc/common/Makefile b/libsrc/common/Makefile index aabe87d68..e5d093f57 100644 --- a/libsrc/common/Makefile +++ b/libsrc/common/Makefile @@ -11,13 +11,41 @@ %.o: %.s @$(AS) -g -o $@ $(AFLAGS) $< -C_OBJS = fclose.o fgets.o calloc.o _fopen.o\ - fputs.o fread.o fwrite.o gets.o realloc.o bsearch.o strxfrm.o\ - _hextab.o fdopen.o strtok.o\ - _afailed.o fopen.o fgetc.o fputc.o puts.o gets.o perror.o getchar.o\ - vprintf.o abort.o qsort.o putchar.o\ - errormsg.o freopen.o locale.o fsetpos.o\ - fgetpos.o rewind.o fseek.o ftell.o +C_OBJS = _afailed.o \ + _fopen.o \ + _hextab.o \ + abort.o \ + bsearch.o \ + calloc.o \ + errormsg.o \ + fclose.o \ + fdopen.o \ + fgetc.o \ + fgetpos.o \ + fgets.o \ + fopen.o \ + fputc.o \ + fputs.o \ + fread.o \ + freopen.o \ + fseek.o \ + fsetpos.o \ + ftell.o \ + fwrite.o \ + getchar.o \ + gets.o \ + locale.o \ + perror.o \ + putchar.o \ + puts.o \ + qsort.o \ + realloc.o \ + rewind.o \ + sscanf.o \ + strxfrm.o \ + strtok.o \ + vprintf.o + S_OBJS = _fdesc.o \ _file.o \ @@ -25,7 +53,6 @@ S_OBJS = _fdesc.o \ _heap.o \ _oserror.o \ _printf.o \ - _stksize.o \ _swap.o \ _sys.o \ abs.o \ diff --git a/libsrc/common/_heap.s b/libsrc/common/_heap.s index f3a5ade48..5758c7c34 100644 --- a/libsrc/common/_heap.s +++ b/libsrc/common/_heap.s @@ -6,7 +6,7 @@ .export __horg, __hptr, __hend, __hfirst, __hlast .constructor initheap, 24 - .import __BSS_RUN__, __BSS_SIZE__, __stksize + .import __BSS_RUN__, __BSS_SIZE__, __STACKSIZE__ .importzp sp .data @@ -30,10 +30,10 @@ __hlast: initheap: sec lda sp - sbc __stksize + sbc #<__STACKSIZE__ sta __hend lda sp+1 - sbc __stksize+1 + sbc #>__STACKSIZE__ sta __hend+1 rts diff --git a/libsrc/common/_stksize.s b/libsrc/common/_stksize.s deleted file mode 100644 index 9d8d6079d..000000000 --- a/libsrc/common/_stksize.s +++ /dev/null @@ -1,15 +0,0 @@ -; -; Ullrich von Bassewitz, 03.06.1998 -; -; Stack default size definition -; - - .export __stksize - -.data - -__stksize: - .word $800 ; 2K - - -