6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-24 08:29:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix tons of warnings, convert burg to use Makefile.common system, rename

Browse Source 
gram.y to gram.yc so that we don't try to turn it into a .cpp file.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3874 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-09-22 02:40:40 +00:00
parent c078930ee3
commit 9c9bfa7f29
18 changed files with 72 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
support/tools/Burg/Makefile
View File

@ -1,100 +1,32 @@
# $Id$
LEVEL = ../..
TOOLNAME = burg
EXTRASOURCES = gram.tab.c
UNAME := $(shell uname)
include $(LEVEL)/Makefile.config
include $(LEVEL)/Makefile.$(UNAME)
include $(LEVEL)/Makefile.common
TARGET = burg.$(UNAME)
gram.tab.c gram.tab.h: gram.yc
$(VERB) $(BISON) -d $<
$(VERB) mv -f gram.tab.cc gram.tab.c
$(VERB) mv -f gram.tab.hc gram.tab.h
#CFLAGS =
#CFLAGS = -O
#CFLAGS = -O -DNOLEX
CFLAGS = -g -DDEBUG
#CFLAGS = -g -DNOLEX -DDEBUG
SRCS = \
be.c \
burs.c \
closure.c \
delta.c \
fe.c \
item.c \
lex.c \
list.c \
main.c \
map.c \
nonterminal.c \
operator.c \
pattern.c \
plank.c \
queue.c \
rule.c \
string.c \
symtab.c \
table.c \
trim.c \
zalloc.c
BU_OBJS = \
burs.o \
closure.o \
delta.o \
item.o \
list.o \
map.o \
nonterminal.o \
operator.o \
pattern.o \
queue.o \
rule.o \
table.o \
trim.o \
zalloc.o
BU_OBJS := $(addprefix $(UNAME)/,$(BU_OBJS))
FE_OBJS = \
be.o \
fe.o \
lex.o \
main.o \
plank.o \
string.o \
symtab.o \
y.tab.o
FE_OBJS := $(addprefix $(UNAME)/,$(FE_OBJS))
all: $(TARGET)
$(TARGET): $(BU_OBJS) $(FE_OBJS)
$(CC) -o $(TARGET) $(CFLAGS) $(BU_OBJS) $(FE_OBJS)
y.tab.c y.tab.h: gram.y
yacc -d gram.y
clean:
rm -rf $(UNAME) *.o y.tab.h y.tab.c core burg *.aux *.log *.dvi sample sample.c tmp
clean::
rm -ff y.tab.h y.tab.c core *.aux *.log *.dvi sample sample.c tmp
$(FE_OBJS): b.h
$(BU_OBJS): b.h
$(FE_OBJS): fe.h
lex.o: y.tab.h
$(BUILD_ROOT)/Release/lex.o $(BUILD_ROOT)/Profile/lex.o $(BUILD_ROOT)/Debug/lex.o: gram.tab.h
doc.dvi: doc.tex
latex doc; latex doc
$(UNAME)/%.o: %.c
$(VERB) $(CC) -c -g $< -o $@
test: $(TARGET) sample.gr
./$(TARGET) -I <sample.gr >sample.c && cc $(CFLAGS) -o sample sample.c && ./sample
./$(TARGET) -I sample.gr >tmp && cmp tmp sample.c
./$(TARGET) -I <sample.gr -o tmp && cmp tmp sample.c
./$(TARGET) -I sample.gr -o tmp && cmp tmp sample.c
./$(TARGET) -I -O0 <sample.gr >tmp && cmp tmp sample.c
./$(TARGET) -I -= <sample.gr >tmp && cmp tmp sample.c
test: $(TOOLEXENAME_G) sample.gr
$(TOOLEXENAME_G) -I <sample.gr >sample.c && $(CC) $(CFLAGS) -o sample sample.c && ./sample
$(TOOLEXENAME_G) -I sample.gr >tmp && cmp tmp sample.c
$(TOOLEXENAME_G) -I <sample.gr -o tmp && cmp tmp sample.c
$(TOOLEXENAME_G) -I sample.gr -o tmp && cmp tmp sample.c
$(TOOLEXENAME_G) -I -O0 <sample.gr >tmp && cmp tmp sample.c
$(TOOLEXENAME_G) -I -= <sample.gr >tmp && cmp tmp sample.c

6
support/tools/Burg/b.h
View File

@ -306,6 +306,6 @@ extern int debugTables;
extern void doStart ARGS((char *));
extern void exit ARGS((int));
extern int fatal ARGS((char *, int));
extern void yyerror ARGS((char *));
extern void yyerror1 ARGS((char *));
extern int fatal ARGS((const char *, int));
extern void yyerror ARGS((const char *));
extern void yyerror1 ARGS((const char *));

12
support/tools/Burg/be.c
View File

@ -8,7 +8,7 @@ char rcsid_be[] = "$Id$";
#define ERROR_VAL 0
FILE *outfile;
char *prefix = "burm";
const char *prefix = "burm";
static void doKids ARGS((RuleAST));
static void doLabel ARGS((Operator));
@ -24,7 +24,7 @@ static void printPatternAST_int ARGS((PatternAST));
static void setVectors ARGS((PatternAST));
static void trailing_zeroes ARGS((int));
static int seminal ARGS((int from, int to));
static void printRule ARGS((RuleAST, char *));
static void printRule ARGS((RuleAST, const char *));
static void
doLabel(op) Operator op;
@ -329,10 +329,10 @@ makeLHSmap()
fprintf(outfile, "\t0,\n");
}
}
fprintf(outfile, "};\n\n", prefix);
fprintf(outfile, "};\n\n");
}
static int seminal(from, to)
static int seminal(int from, int to)
{
return allpairs[from][to].rule ? allpairs[from][to].rule->erulenum : 0;
@ -453,7 +453,7 @@ makeDeltaCostArray()
for (s = 0; s < states-1; s++) {
fprintf(outfile, "{ /* state #%d: ", s+1);
printRepresentative(outfile, sortedStates[s]);
fprintf(outfile, " */\n", s+1);
fprintf(outfile, " */\n");
fprintf(outfile, "\t{0},\n");
for (nt = 1; nt < last_user_nonterminal; nt++) {
makeCostVector(1, sortedStates[s]->closed[nt].delta);
@ -616,7 +616,7 @@ makeNts()
}
static void
printRule(r,d) RuleAST r; char *d;
printRule(RuleAST r, const char *d)
{
if (r) {
fprintf(outfile, "%s: ", r->rule->lhs->name);

2
support/tools/Burg/fe.h
View File

@ -121,7 +121,7 @@ extern int max_ruleAST;
extern List ruleASTs;
extern FILE *outfile;
extern char *prefix;
extern const char *prefix;
extern int trimflag;
extern int speedflag;
extern int grammarflag;

1
support/tools/Burg/gram.y → support/tools/Burg/gram.yc
View File

@ -4,6 +4,7 @@ char rcsid_gram[] = "$Id$";
#include <stdio.h>
#include "b.h"
#include "fe.h"
int doGram(List);
%}
%union {

7
support/tools/Burg/lex.c
View File

@ -5,7 +5,7 @@ char rcsid_lex[] = "$Id$";
#include <string.h>
#include "b.h"
#include "fe.h"
#include "y.tab.h"
#include "gram.tab.h"
static char buf[BUFSIZ];
@ -245,14 +245,13 @@ yylex()
return(0);
}
void
yyerror1(str) char *str;
void yyerror1(const char *str)
{
fprintf(stderr, "line %d: %s", yyline, str);
}
void
yyerror(str) char *str;
yyerror(const char *str)
{
yyerror1(str);
fprintf(stderr, "\n");

2
support/tools/Burg/nonterminal.c
View File

@ -2,6 +2,7 @@ char rcsid_nonterminal[] = "$Id$";
#include "b.h"
#include <stdio.h>
#include <string.h>
NonTerminal start;
NonTerminalNum max_nonterminal = 1;
@ -29,7 +30,6 @@ int
nonTerminalName(buf, i) char *buf; int i;
{
List l;
extern char *strcpy ARGS((char *, char *));
for (l = nonterminals; l; l = l->next) {
NonTerminal nt = (NonTerminal) l->x;

5
support/tools/Burg/plank.c
View File

@ -2,6 +2,7 @@ char rcsid_plank[] = "$Id$";
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "b.h"
#include "fe.h"
@ -35,7 +36,7 @@ static void purgePlanks ARGS((List));
static void inToEx ARGS((void));
static void makePlankRuleMacros ARGS((void));
static void makePlankRule ARGS((void));
static void exceptionSwitch ARGS((List, char *, char *, char *, int, char *));
static void exceptionSwitch ARGS((List, const char *, const char *, const char *, int, const char *));
static void doPlankLabel ARGS((Operator));
static void doPlankLabelSafely ARGS((Operator));
static void doPlankLabelMacrosSafely ARGS((Operator));
@ -602,7 +603,7 @@ makePlankRule()
}
static void
exceptionSwitch(es, sw, pre, post, offset, def) List es; char *sw; char *pre; char *post; int offset; char *def;
exceptionSwitch(es, sw, pre, post, offset, def) List es; const char *sw; const char *pre; const char *post; int offset; const char *def;
{
if (es) {
fprintf(outfile, "\t\tswitch (%s) {\n", sw);

2
support/tools/Burg/zalloc.c
View File

@ -9,7 +9,7 @@ extern void free ARGS((void *));
extern void *malloc ARGS((unsigned));
int
fatal(name, line) char *name; int line;
fatal(const char *name, int line)
{
fprintf(stderr, "assertion failed: file %s, line %d\n", name, line);
exit(1);

102
utils/Burg/Makefile
View File

@ -1,100 +1,32 @@
# $Id$
LEVEL = ../..
TOOLNAME = burg
EXTRASOURCES = gram.tab.c
UNAME := $(shell uname)
include $(LEVEL)/Makefile.config
include $(LEVEL)/Makefile.$(UNAME)
include $(LEVEL)/Makefile.common
TARGET = burg.$(UNAME)
gram.tab.c gram.tab.h: gram.yc
$(VERB) $(BISON) -d $<
$(VERB) mv -f gram.tab.cc gram.tab.c
$(VERB) mv -f gram.tab.hc gram.tab.h
#CFLAGS =
#CFLAGS = -O
#CFLAGS = -O -DNOLEX
CFLAGS = -g -DDEBUG
#CFLAGS = -g -DNOLEX -DDEBUG
SRCS = \
be.c \
burs.c \
closure.c \
delta.c \
fe.c \
item.c \
lex.c \
list.c \
main.c \
map.c \
nonterminal.c \
operator.c \
pattern.c \
plank.c \
queue.c \
rule.c \
string.c \
symtab.c \
table.c \
trim.c \
zalloc.c
BU_OBJS = \
burs.o \
closure.o \
delta.o \
item.o \
list.o \
map.o \
nonterminal.o \
operator.o \
pattern.o \
queue.o \
rule.o \
table.o \
trim.o \
zalloc.o
BU_OBJS := $(addprefix $(UNAME)/,$(BU_OBJS))
FE_OBJS = \
be.o \
fe.o \
lex.o \
main.o \
plank.o \
string.o \
symtab.o \
y.tab.o
FE_OBJS := $(addprefix $(UNAME)/,$(FE_OBJS))
all: $(TARGET)
$(TARGET): $(BU_OBJS) $(FE_OBJS)
$(CC) -o $(TARGET) $(CFLAGS) $(BU_OBJS) $(FE_OBJS)
y.tab.c y.tab.h: gram.y
yacc -d gram.y
clean:
rm -rf $(UNAME) *.o y.tab.h y.tab.c core burg *.aux *.log *.dvi sample sample.c tmp
clean::
rm -ff y.tab.h y.tab.c core *.aux *.log *.dvi sample sample.c tmp
$(FE_OBJS): b.h
$(BU_OBJS): b.h
$(FE_OBJS): fe.h
lex.o: y.tab.h
$(BUILD_ROOT)/Release/lex.o $(BUILD_ROOT)/Profile/lex.o $(BUILD_ROOT)/Debug/lex.o: gram.tab.h
doc.dvi: doc.tex
latex doc; latex doc
$(UNAME)/%.o: %.c
$(VERB) $(CC) -c -g $< -o $@
test: $(TARGET) sample.gr
./$(TARGET) -I <sample.gr >sample.c && cc $(CFLAGS) -o sample sample.c && ./sample
./$(TARGET) -I sample.gr >tmp && cmp tmp sample.c
./$(TARGET) -I <sample.gr -o tmp && cmp tmp sample.c
./$(TARGET) -I sample.gr -o tmp && cmp tmp sample.c
./$(TARGET) -I -O0 <sample.gr >tmp && cmp tmp sample.c
./$(TARGET) -I -= <sample.gr >tmp && cmp tmp sample.c
test: $(TOOLEXENAME_G) sample.gr
$(TOOLEXENAME_G) -I <sample.gr >sample.c && $(CC) $(CFLAGS) -o sample sample.c && ./sample
$(TOOLEXENAME_G) -I sample.gr >tmp && cmp tmp sample.c
$(TOOLEXENAME_G) -I <sample.gr -o tmp && cmp tmp sample.c
$(TOOLEXENAME_G) -I sample.gr -o tmp && cmp tmp sample.c
$(TOOLEXENAME_G) -I -O0 <sample.gr >tmp && cmp tmp sample.c
$(TOOLEXENAME_G) -I -= <sample.gr >tmp && cmp tmp sample.c

6
utils/Burg/b.h
View File

@ -306,6 +306,6 @@ extern int debugTables;
extern void doStart ARGS((char *));
extern void exit ARGS((int));
extern int fatal ARGS((char *, int));
extern void yyerror ARGS((char *));
extern void yyerror1 ARGS((char *));
extern int fatal ARGS((const char *, int));
extern void yyerror ARGS((const char *));
extern void yyerror1 ARGS((const char *));

12
utils/Burg/be.c
View File

@ -8,7 +8,7 @@ char rcsid_be[] = "$Id$";
#define ERROR_VAL 0
FILE *outfile;
char *prefix = "burm";
const char *prefix = "burm";
static void doKids ARGS((RuleAST));
static void doLabel ARGS((Operator));
@ -24,7 +24,7 @@ static void printPatternAST_int ARGS((PatternAST));
static void setVectors ARGS((PatternAST));
static void trailing_zeroes ARGS((int));
static int seminal ARGS((int from, int to));
static void printRule ARGS((RuleAST, char *));
static void printRule ARGS((RuleAST, const char *));
static void
doLabel(op) Operator op;
@ -329,10 +329,10 @@ makeLHSmap()
fprintf(outfile, "\t0,\n");
}
}
fprintf(outfile, "};\n\n", prefix);
fprintf(outfile, "};\n\n");
}
static int seminal(from, to)
static int seminal(int from, int to)
{
return allpairs[from][to].rule ? allpairs[from][to].rule->erulenum : 0;
@ -453,7 +453,7 @@ makeDeltaCostArray()
for (s = 0; s < states-1; s++) {
fprintf(outfile, "{ /* state #%d: ", s+1);
printRepresentative(outfile, sortedStates[s]);
fprintf(outfile, " */\n", s+1);
fprintf(outfile, " */\n");
fprintf(outfile, "\t{0},\n");
for (nt = 1; nt < last_user_nonterminal; nt++) {
makeCostVector(1, sortedStates[s]->closed[nt].delta);
@ -616,7 +616,7 @@ makeNts()
}
static void
printRule(r,d) RuleAST r; char *d;
printRule(RuleAST r, const char *d)
{
if (r) {
fprintf(outfile, "%s: ", r->rule->lhs->name);

2
utils/Burg/fe.h
View File

@ -121,7 +121,7 @@ extern int max_ruleAST;
extern List ruleASTs;
extern FILE *outfile;
extern char *prefix;
extern const char *prefix;
extern int trimflag;
extern int speedflag;
extern int grammarflag;

1
utils/Burg/gram.y → utils/Burg/gram.yc
View File

@ -4,6 +4,7 @@ char rcsid_gram[] = "$Id$";
#include <stdio.h>
#include "b.h"
#include "fe.h"
int doGram(List);
%}
%union {

7
utils/Burg/lex.c
View File

@ -5,7 +5,7 @@ char rcsid_lex[] = "$Id$";
#include <string.h>
#include "b.h"
#include "fe.h"
#include "y.tab.h"
#include "gram.tab.h"
static char buf[BUFSIZ];
@ -245,14 +245,13 @@ yylex()
return(0);
}
void
yyerror1(str) char *str;
void yyerror1(const char *str)
{
fprintf(stderr, "line %d: %s", yyline, str);
}
void
yyerror(str) char *str;
yyerror(const char *str)
{
yyerror1(str);
fprintf(stderr, "\n");

2
utils/Burg/nonterminal.c
View File

@ -2,6 +2,7 @@ char rcsid_nonterminal[] = "$Id$";
#include "b.h"
#include <stdio.h>
#include <string.h>
NonTerminal start;
NonTerminalNum max_nonterminal = 1;
@ -29,7 +30,6 @@ int
nonTerminalName(buf, i) char *buf; int i;
{
List l;
extern char *strcpy ARGS((char *, char *));
for (l = nonterminals; l; l = l->next) {
NonTerminal nt = (NonTerminal) l->x;

5
utils/Burg/plank.c
View File

@ -2,6 +2,7 @@ char rcsid_plank[] = "$Id$";
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include "b.h"
#include "fe.h"
@ -35,7 +36,7 @@ static void purgePlanks ARGS((List));
static void inToEx ARGS((void));
static void makePlankRuleMacros ARGS((void));
static void makePlankRule ARGS((void));
static void exceptionSwitch ARGS((List, char *, char *, char *, int, char *));
static void exceptionSwitch ARGS((List, const char *, const char *, const char *, int, const char *));
static void doPlankLabel ARGS((Operator));
static void doPlankLabelSafely ARGS((Operator));
static void doPlankLabelMacrosSafely ARGS((Operator));
@ -602,7 +603,7 @@ makePlankRule()
}
static void
exceptionSwitch(es, sw, pre, post, offset, def) List es; char *sw; char *pre; char *post; int offset; char *def;
exceptionSwitch(es, sw, pre, post, offset, def) List es; const char *sw; const char *pre; const char *post; int offset; const char *def;
{
if (es) {
fprintf(outfile, "\t\tswitch (%s) {\n", sw);

2
utils/Burg/zalloc.c
View File

@ -9,7 +9,7 @@ extern void free ARGS((void *));
extern void *malloc ARGS((unsigned));
int
fatal(name, line) char *name; int line;
fatal(const char *name, int line)
{
fprintf(stderr, "assertion failed: file %s, line %d\n", name, line);
exit(1);