Working on the new backend. Moved the files from the b6502 into the main

compiler dir because the backend is not really a submodule, so this did
not reflect the real relations of the backend to the rest of the compiler.

git-svn-id: svn://svn.cc65.org/cc65/trunk@713 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/cc65/anonname.c b/src/cc65/anonname.c
index 1a52147e2e02d2f402d1c44e40f65c0190acff45..b10ca3c1dc9934d7e65872a57302b7f1ecd2fc6f 100644 (file)
--- a/src/cc65/anonname.c
+++ b/src/cc65/anonname.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 2000      Ullrich von Bassewitz                                       */
+/*               Wacholderweg 14                                             */
+/*               D-70597 Stuttgart                                           */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */

diff --git a/src/cc65/anonname.h b/src/cc65/anonname.h
index 3f833f0ee305dfb92f8473400d3389ff339f64df..123a9cf2646f4334a7ed2652fd49cd200f8c6c90 100644 (file)
--- a/src/cc65/anonname.h
+++ b/src/cc65/anonname.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 2000      Ullrich von Bassewitz                                       */
+/*               Wacholderweg 14                                             */
+/*               D-70597 Stuttgart                                           */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */

diff --git a/src/cc65/asmcode.c b/src/cc65/asmcode.c
index b52987b342de3af8ebdfc78bdfa827a8248d7490..3522ce1694424fa58bb9195bc744d1eee397e1f9 100644 (file)
--- a/src/cc65/asmcode.c
+++ b/src/cc65/asmcode.c
@@ -36,12 +36,10 @@
 /* common */
 #include "check.h"
 
-/* b6502 */
+/* cc65 */
 #include "codeopt.h"
 #include "codeseg.h"
 #include "dataseg.h"
-
-/* cc65 */
 #include "symtab.h"
 #include "asmcode.h"
 

diff --git a/src/cc65/codeent.c b/src/cc65/codeent.c
index 8dff3a528a7d7b4645e7426ba5e1bc6b8c73e086..09e4b3ef87d77f07cc064d714f36ec9c2084cf9b 100644 (file)
--- a/src/cc65/codeent.c
+++ b/src/cc65/codeent.c
@@ -38,13 +38,11 @@
 #include "xmalloc.h"
 
 /* cc65 */
-#include "error.h"
-#include "global.h"
-
-/* b6502 */
 #include "codeinfo.h"
+#include "error.h"
 #include "funcinfo.h"
-#include "label.h"
+#include "global.h"
+#include "codelab.h"
 #include "opcodes.h"
 #include "codeent.h"
 

diff --git a/src/cc65/codeent.h b/src/cc65/codeent.h
index 4140663a814c283521df928666d59d3a8fe0b9d1..61cd3b55f10e1374059bd3bf9b6cb79be82f0f27 100644 (file)
--- a/src/cc65/codeent.h
+++ b/src/cc65/codeent.h
@@ -43,8 +43,8 @@
 /* common */
 #include "coll.h"
 
-/* b6502 */
-#include "label.h"
+/* cc65 */
+#include "codelab.h"
 #include "opcodes.h"
 
 

diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c
index 20478bb6feafca91a295dccb109195905479bc3a..ce7ef5d2c5dda83b18fca451ae313013b0c014fa 100644 (file)
--- a/src/cc65/codegen.c
+++ b/src/cc65/codegen.c
@@ -43,14 +43,12 @@
 #include "xmalloc.h"
 #include "xsprintf.h"
 
-/* b6502 */
-#include "codeseg.h"
-#include "dataseg.h"
-
 /* cc65 */
 #include "asmcode.h"
-#include "asmlabel.h"
+#include "asmlabel.h"                        
+#include "codeseg.h"
 #include "cpu.h"
+#include "dataseg.h"
 #include "error.h"
 #include "global.h"
 #include "segname.h"
@@ -60,7 +58,7 @@
 
 
 /*****************************************************************************/
-/*                                  Data                                    */
+/*                                  Data                                    */
 /*****************************************************************************/
 
 
@@ -74,7 +72,7 @@ segment_t CurSeg = SEG_INV;
 
 
 /*****************************************************************************/
-/*                                 Helpers                                  */
+/*                                 Helpers                                  */
 /*****************************************************************************/
 
 

diff --git a/src/cc65/codelab.c b/src/cc65/codelab.c
index e02fd794638afddf257cbd4d4e2b9ef4dfa949e5..55069c3f96e9cab1670df2ae1ad8243042e63ce1 100644 (file)
--- a/src/cc65/codelab.c
+++ b/src/cc65/codelab.c
@@ -1,6 +1,6 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                 label.c                                  */
+/*                                codelab.c                                 */
 /*                                                                           */
 /*                          Code label structure                            */
 /*                                                                           */
@@ -36,9 +36,9 @@
 /* common */
 #include "xmalloc.h"
 
-/* b6502 */
-#include "codeent.h"    
-#include "label.h"
+/* cc65 */      
+#include "codeent.h"
+#include "codelab.h"
 
 
 

diff --git a/src/cc65/codelab.h b/src/cc65/codelab.h
index 8e6ef97bb56092d149b8e36b8c99d93925c029e0..203d16bd899299f5fdf76806cfaafa0598ab7d90 100644 (file)
--- a/src/cc65/codelab.h
+++ b/src/cc65/codelab.h
@@ -1,6 +1,6 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                 label.h                                  */
+/*                                codelab.h                                 */
 /*                                                                           */
 /*                          Code label structure                            */
 /*                                                                           */
@@ -33,8 +33,8 @@
 
 
 
-#ifndef LABEL_H
-#define LABEL_H
+#ifndef CODELAB_H
+#define CODELAB_H
 
 
 
@@ -100,7 +100,7 @@ void OutputCodeLabel (FILE* F, const CodeLabel* L);
 
 
 
-/* End of label.h */
+/* End of codelab.h */
 #endif
 
 

diff --git a/src/cc65/codeopt.c b/src/cc65/codeopt.c
index 384a414559b0d8360b32e626750bfc6c72ffc687..a0c7be7178fb75893dc42b3a6dff382a1cf10925 100644 (file)
--- a/src/cc65/codeopt.c
+++ b/src/cc65/codeopt.c
@@ -37,11 +37,9 @@
 #include "print.h"
 
 /* cc65 */
-#include "global.h"
-
-/* b6502 */
 #include "codeent.h"
 #include "codeinfo.h"
+#include "global.h"
 #include "codeopt.h"
 
 
@@ -117,7 +115,7 @@ static void OptDeadJumps (CodeSeg* S)
 
 static void OptDeadCode (CodeSeg* S)
 /* Remove dead code (code that follows an unconditional jump or an rts/rti
- * and has no label) 
+ * and has no label)
  */
 {
     unsigned I;

diff --git a/src/cc65/codeopt.h b/src/cc65/codeopt.h
index 4edacb11ba96a75c4b46bba9e777f40f3e992740..15960a99fb555488e6741021582a029daf6a3971 100644 (file)
--- a/src/cc65/codeopt.h
+++ b/src/cc65/codeopt.h
@@ -38,7 +38,7 @@
 
 
 
-/* b6502 */
+/* cc65 */
 #include "codeseg.h"
 
 

diff --git a/src/cc65/codeseg.c b/src/cc65/codeseg.c
index aed667b854b0d3c184670ba50666fee82b0f2c2d..264bee2f7ca1c2aace6c437fdfeae07e8727c414 100644 (file)
--- a/src/cc65/codeseg.c
+++ b/src/cc65/codeseg.c
@@ -45,11 +45,9 @@
 #include "xsprintf.h"
 
 /* cc65 */
-#include "error.h"
-
-/* b6502 */
 #include "codeent.h"
 #include "codeinfo.h"
+#include "error.h"
 #include "codeseg.h"
 
 

diff --git a/src/cc65/codeseg.h b/src/cc65/codeseg.h
index 59bfb08423903d9df11e749bfc393097d787670e..d09f07a8ce6efc295120c49692f7b41e6aa07b76 100644 (file)
--- a/src/cc65/codeseg.h
+++ b/src/cc65/codeseg.h
@@ -44,8 +44,8 @@
 #include "attrib.h"
 #include "coll.h"
 
-/* b6502 */
-#include "label.h"
+/* cc65 */
+#include "codelab.h"
 
 
 

diff --git a/src/cc65/make/gcc.mak b/src/cc65/make/gcc.mak
index a490d8dceb20d5d8900abdb9624d97b344376f28..4f839e4e1fcc1750969f81a0b305790bf1f6c9bd 100644 (file)
--- a/src/cc65/make/gcc.mak
+++ b/src/cc65/make/gcc.mak
@@ -11,11 +11,10 @@ EXE         = cc65
 
 # Library directories
 COMMON = ../common
-B6502  = b6502
 
 # Default for the compiler lib search path as compiler define
 CDEFS=-DCC65_INC=\"/usr/lib/cc65/include/\"
-CFLAGS = -O2 -g -Wall -I$(COMMON) -I$(B6502) $(CDEFS)
+CFLAGS = -O2 -g -Wall -I$(COMMON) $(CDEFS)
 CC=gcc
 EBIND=emxbind
 LDFLAGS=
@@ -26,9 +25,14 @@ LDFLAGS=
 OBJS = anonname.o      \
        asmcode.o       \
        asmlabel.o      \
+       codeent.o       \
        codegen.o       \
+       codelab.o       \
+       codeopt.o       \
+       codeseg.o       \
        compile.o       \
        cpu.o           \
+       dataseg.o       \
        datatype.o      \
        declare.o       \
        declattr.o      \
@@ -37,6 +41,7 @@ OBJS =        anonname.o      \
        exprheap.o      \
        exprnode.o      \
        funcdesc.o      \
+       funcinfo.o      \
        function.o      \
        global.o        \
        goto.o          \
@@ -48,6 +53,7 @@ OBJS =        anonname.o      \
        loop.o          \
        macrotab.o      \
        main.o          \
+       opcodes.o       \
        preproc.o       \
        pragma.o        \
        scanner.o       \
@@ -59,8 +65,7 @@ OBJS =        anonname.o      \
        typecmp.o       \
        util.o
 
-LIBS = $(B6502)/b6502.a        \
-       $(COMMON)/common.a
+LIBS = $(COMMON)/common.a
 
 
 # ------------------------------------------------------------------------------
@@ -76,16 +81,10 @@ all:        depend
        @$(MAKE) -f make/gcc.mak all
 endif
 
-$(EXE):        $(OBJS) $(LIBS) subs
+$(EXE):        $(OBJS) $(LIBS)
        $(CC) $(LDFLAGS) -o $(EXE) $(CFLAGS) $(OBJS) $(LIBS)
        @if [ $(OS2_SHELL) ] ;  then $(EBIND) $(EXE) ; fi
 
-.PHONY:        subs
-subs:
-       @for dir in $(COMMON) $(B6502); do              \
-           $(MAKE) -C $$dir -f make/gcc.mak || exit 1; \
-       done                                            
-
 clean:
        rm -f *~ core *.map
 
@@ -98,6 +97,6 @@ zap:  clean
 .PHONY: depend dep
 depend dep:    $(OBJS:.o=.c)
        @echo "Creating dependency information"
-       $(CC) -I$(COMMON) -I$(B6502) -MM $^ > .depend
+       $(CC) -I$(COMMON) -MM $^ > .depend
 
 

diff --git a/src/cc65/opcodes.c b/src/cc65/opcodes.c
index b2165b20f474b58d4eda0f0d37832a99fab0616f..4396cb211580664d64207cdfe6ff40335eb18b80 100644 (file)
--- a/src/cc65/opcodes.c
+++ b/src/cc65/opcodes.c
@@ -41,10 +41,8 @@
 #include "check.h"
 
 /* cc65 */
-#include "error.h"
-
-/* b6502 */
 #include "codeinfo.h"
+#include "error.h"
 #include "opcodes.h"
 
 

diff --git a/src/cc65/opcodes.h b/src/cc65/opcodes.h
index b4c372a534ccd9eefca92d95f456e3f5eacc67dd..58375b72536568ee7e84b5d38e424315ba00878c 100644 (file)
--- a/src/cc65/opcodes.h
+++ b/src/cc65/opcodes.h
@@ -143,10 +143,6 @@ typedef struct {
     char       Mnemo[4];       /* Mnemonic */
     opc_t      OPC;            /* Opcode */
     unsigned   Size;           /* Size, 0 means "check addressing mode" */
-####
-    unsigned char Use;
-    unsigned char Load;
-
     unsigned           Info;           /* Usage flags */
 } OPCDesc;
 

diff --git a/src/cc65/segname.c b/src/cc65/segname.c
index 4bfbf7c442190bcfc84aaf73788d6c808ed6b830..422d86ec96f711ed6d9d225f9e6090b900ffbab4 100644 (file)
--- a/src/cc65/segname.c
+++ b/src/cc65/segname.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 2000      Ullrich von Bassewitz                                       */
+/*               Wacholderweg 14                                             */
+/*               D-70597 Stuttgart                                           */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */

diff --git a/src/cc65/segname.h b/src/cc65/segname.h
index 2367056795492377516df4109be483578fc9824a..b200d213cfdb955ff572b7d055a6c0501a21067a 100644 (file)
--- a/src/cc65/segname.h
+++ b/src/cc65/segname.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 2000      Ullrich von Bassewitz                                       */
+/*               Wacholderweg 14                                             */
+/*               D-70597 Stuttgart                                           */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */