From 02cbc7da254e5218394c9ff55e75bb80df633823 Mon Sep 17 00:00:00 2001 From: uz Date: Wed, 4 Jan 2012 22:02:02 +0000 Subject: [PATCH] Moved the segdefs module to ca65, since it was used only there and renamed it to segdef, since there might be a new segdefs module in common soon. git-svn-id: svn://svn.cc65.org/cc65/trunk@5381 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/ca65/make/gcc.mak | 1 + src/ca65/make/watcom.mak | 1 + src/{common/segdefs.c => ca65/segdef.c} | 18 ++++++++++-------- src/{common/segdefs.h => ca65/segdef.h} | 18 +++++++++--------- src/ca65/segment.h | 2 +- src/common/make/gcc.mak | 1 - src/common/make/watcom.mak | 1 - src/ld65/condes.c | 1 - src/ld65/segments.c | 4 ++-- src/od65/dump.c | 1 - 10 files changed, 24 insertions(+), 24 deletions(-) rename src/{common/segdefs.c => ca65/segdef.c} (86%) rename src/{common/segdefs.h => ca65/segdef.h} (87%) diff --git a/src/ca65/make/gcc.mak b/src/ca65/make/gcc.mak index 46d432bbd..9d8e782a9 100644 --- a/src/ca65/make/gcc.mak +++ b/src/ca65/make/gcc.mak @@ -55,6 +55,7 @@ OBJS = anonname.o \ pseudo.o \ repeat.o \ scanner.o \ + segdef.o \ segment.o \ sizeof.o \ span.o \ diff --git a/src/ca65/make/watcom.mak b/src/ca65/make/watcom.mak index 8760b0691..e7802d8cb 100644 --- a/src/ca65/make/watcom.mak +++ b/src/ca65/make/watcom.mak @@ -88,6 +88,7 @@ OBJS = anonname.obj \ pseudo.obj \ repeat.obj \ scanner.obj \ + segdef.obj \ segment.obj \ sizeof.obj \ span.obj \ diff --git a/src/common/segdefs.c b/src/ca65/segdef.c similarity index 86% rename from src/common/segdefs.c rename to src/ca65/segdef.c index 5e0c5e9e1..a08a18dc1 100644 --- a/src/common/segdefs.c +++ b/src/ca65/segdef.c @@ -1,15 +1,15 @@ /*****************************************************************************/ /* */ -/* segdefs.c */ +/* segdef.c */ /* */ -/* Segment definitions for the bin65 binary utils */ +/* Segment definitions for the ca65 assembler */ /* */ /* */ /* */ -/* (C) 2002-2003 Ullrich von Bassewitz */ -/* Römerstraße 52 */ -/* D-70794 Filderstadt */ -/* EMail: uz@cc65.org */ +/* (C) 1998-2012, Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -35,7 +35,9 @@ /* common */ #include "xmalloc.h" -#include "segdefs.h" + +/* ca65 */ +#include "segdef.h" @@ -78,4 +80,4 @@ SegDef* DupSegDef (const SegDef* Def) - + diff --git a/src/common/segdefs.h b/src/ca65/segdef.h similarity index 87% rename from src/common/segdefs.h rename to src/ca65/segdef.h index 5fbb8cb13..bea326ecd 100644 --- a/src/common/segdefs.h +++ b/src/ca65/segdef.h @@ -1,15 +1,15 @@ /*****************************************************************************/ /* */ -/* segdefs.h */ +/* segdef.h */ /* */ -/* Segment definitions for the bin65 binary utils */ +/* Segment definitions for the ca65 assembler */ /* */ /* */ /* */ -/* (C) 1998-2003 Ullrich von Bassewitz */ -/* Römerstraße 52 */ -/* D-70794 Filderstadt */ -/* EMail: uz@cc65.org */ +/* (C) 1998-2012, Ullrich von Bassewitz */ +/* Roemerstrasse 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -33,8 +33,8 @@ -#ifndef SEGDEFS_H -#define SEGDEFS_H +#ifndef SEGDEF_H +#define SEGDEF_H @@ -77,7 +77,7 @@ SegDef* DupSegDef (const SegDef* D); /* Duplicate a segment definition and return it */ - + /* End of segdefs.h */ #endif diff --git a/src/ca65/segment.h b/src/ca65/segment.h index 0575bc774..faa3c5289 100644 --- a/src/ca65/segment.h +++ b/src/ca65/segment.h @@ -42,10 +42,10 @@ #include "coll.h" #include "fragdefs.h" #include "inline.h" -#include "segdefs.h" /* ca65 */ #include "fragment.h" +#include "segdef.h" diff --git a/src/common/make/gcc.mak b/src/common/make/gcc.mak index 049f44eed..54484a7a7 100644 --- a/src/common/make/gcc.mak +++ b/src/common/make/gcc.mak @@ -37,7 +37,6 @@ OBJS = abend.o \ mmodel.o \ print.o \ searchpath.o \ - segdefs.o \ segnames.o \ shift.o \ strbuf.o \ diff --git a/src/common/make/watcom.mak b/src/common/make/watcom.mak index 99a9924fc..e9d7e01c1 100644 --- a/src/common/make/watcom.mak +++ b/src/common/make/watcom.mak @@ -79,7 +79,6 @@ OBJS = abend.obj \ mmodel.obj \ print.obj \ searchpath.obj \ - segdefs.obj \ segnames.obj \ shift.obj \ strbuf.obj \ diff --git a/src/ld65/condes.c b/src/ld65/condes.c index 1e0406a64..836c9a58a 100644 --- a/src/ld65/condes.c +++ b/src/ld65/condes.c @@ -40,7 +40,6 @@ #include "check.h" #include "coll.h" #include "fragdefs.h" -#include "segdefs.h" #include "xmalloc.h" /* ld65 */ diff --git a/src/ld65/segments.c b/src/ld65/segments.c index b67d0e221..a4e54317c 100644 --- a/src/ld65/segments.c +++ b/src/ld65/segments.c @@ -37,6 +37,7 @@ #include /* common */ +#include "addrsize.h" #include "alignment.h" #include "check.h" #include "coll.h" @@ -44,7 +45,6 @@ #include "fragdefs.h" #include "hashfunc.h" #include "print.h" -#include "segdefs.h" #include "symdefs.h" #include "xmalloc.h" @@ -105,7 +105,7 @@ static Segment* NewSegment (unsigned Name, unsigned char AddrSize) S->ReadOnly = 0; S->Dumped = 0; S->BankRef = 0; - + /* Insert the segment into the segment list and assign the segment id */ S->Id = CollCount (&SegmentList); CollAppend (&SegmentList, S); diff --git a/src/od65/dump.c b/src/od65/dump.c index 92ead85c1..e0cf5c010 100644 --- a/src/od65/dump.c +++ b/src/od65/dump.c @@ -46,7 +46,6 @@ #include "objdefs.h" #include "optdefs.h" #include "scopedefs.h" -#include "segdefs.h" #include "symdefs.h" #include "xmalloc.h" -- 2.39.5