# HG changeset patch # User William Astle # Date 1379793198 21600 # Node ID 7957e90d0a35297dd1ac53546b37d7cbdb57d8b2 # Parent 65ed8dde533158cd41e992acaf85cb52e90be7f0 Add skeleton compiler target to build diff -r 65ed8dde5331 -r 7957e90d0a35 .hgignore --- a/.hgignore Sat Sep 21 13:35:40 2013 -0600 +++ b/.hgignore Sat Sep 21 13:53:18 2013 -0600 @@ -11,3 +11,4 @@ /lwasm$ /lwcc$ /lwcc-cpp$ +/lwcc-cc$ diff -r 65ed8dde5331 -r 7957e90d0a35 Makefile --- a/Makefile Sat Sep 21 13:35:40 2013 -0600 +++ b/Makefile Sat Sep 21 13:53:18 2013 -0600 @@ -56,9 +56,10 @@ lwar/lwar$(PROGSUFFIX) \ lwlink/lwobjdump$(PROGSUFFIX) \ lwcc/lwcc$(PROGSUFFIX) \ - lwcc/lwcc-cpp$(PROGSUFFIX) + lwcc/lwcc-cpp$(PROGSUFFIX) \ + lwcc/lwcc-cc$(PROGSUFFIX) -LWCC_LIBBIN_FILES = lwcc/lwcc-cpp$(PROGSUFFIX) +LWCC_LIBBIN_FILES = lwcc/lwcc-cpp$(PROGSUFFIX) lwcc/lwcc-cc$(PROGSUFFIX) LWCC_LIBLIB_FILES = LWCC_LIBINC_FILES = @@ -107,12 +108,17 @@ lwcc_cpp_objs := $(lwcc_cpp_srcs:.c=.o) lwcc_cpp_deps := $(lwcc_cpp_srcs:.c=.d) +lwcc_cc_srcs := cc-main.c +lwcc_cc_srcs := $(addprefix lwcc/,$(lwcc_cc_srcs)) +lwcc_cc_objs := $(lwcc_cc_srcs:.c=.o) +lwcc_cc_deps := $(lwcc_cc_srcs:.c=.d) + lwcc_cpplib_srcs := cpp.c lex.c token.c preproc.c symbol.c lwcc_cpplib_srcs := $(addprefix lwcc/,$(lwcc_cpplib_srcs)) lwcc_cpplib_objs := $(lwcc_cpplib_srcs:.c=.o) lwcc_cpplib_deps := $(lwcc_cpplib_srcs:.c=.d) -lwcc_deps := $(lwcc_cpp_deps) $(lwcc_driver_deps) $(lwcc_cpplib_deps) +lwcc_deps := $(lwcc_cpp_deps) $(lwcc_driver_deps) $(lwcc_cpplib_deps) $(lwcc_cc_deps) .PHONY: lwlink lwasm lwar lwobjdump lwcc lwlink: lwlink/lwlink$(PROGSUFFIX) @@ -147,6 +153,10 @@ @echo Linking $@ @$(CC) -o $@ $(lwcc_cpp_objs) lwcc/libcpp.a $(LDFLAGS) +lwcc/lwcc-cc$(PROGSUFFIX): $(lwcc_cc_objs) lwlib lwcc-cpplib + @echo Linking $@ + @$(CC) -o $@ $(lwcc_cc_objs) lwcc/libcpp.a $(LDFLAGS) + .INTERMEDIATE: lwcc-cpplib lwcc-cpplib: lwcc/libcpp.a lwcc/libcpp.a: $(lwcc_cpplib_objs) @@ -185,7 +195,7 @@ @echo "Cleaning up" @rm -f lwlib/liblw.a lwasm/lwasm$(PROGSUFFIX) lwlink/lwlink$(PROGSUFFIX) lwlink/lwobjdump$(PROGSUFFIX) lwar/lwar$(PROGSUFFIX) @rm -f lwcc/lwcc$(PROGSUFFIX) lwcc/lwcc-cpp$(PROGSUFFIX) lwcc/libcpp.a - @rm -f $(lwcc_driver_objs) $(lwcc_cpp_objs) $(lwcc_cpplib_objs) + @rm -f $(lwcc_driver_objs) $(lwcc_cpp_objs) $(lwcc_cpplib_objs) $(lwcc_cc_objs) @rm -f $(lwasm_objs) $(lwlink_objs) $(lwar_objs) $(lwlib_objs) $(lwobjdump_objs) @rm -f $(extra_clean) @rm -f */*.exe @@ -194,7 +204,7 @@ realclean: clean $(realcleantargs) @echo "Cleaning up even more" @rm -f $(lwasm_deps) $(lwlink_deps) $(lwar_deps) $(lwlib_deps) $(lwobjdump_deps) - @rm -f $(lwcc_driver_deps) $(lwcc_cpp_deps) $(lwcc_cpplib_deps) + @rm -f $(lwcc_driver_deps) $(lwcc_cpp_deps) $(lwcc_cpplib_deps) $(lwcc_cc_deps) print-%: @echo $* = $($*) diff -r 65ed8dde5331 -r 7957e90d0a35 lwcc/cc-main.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lwcc/cc-main.c Sat Sep 21 13:53:18 2013 -0600 @@ -0,0 +1,259 @@ +/* +lwcc/cpp-main.c + +Copyright © 2013 William Astle + +This file is part of LWTOOLS. + +LWTOOLS is free software: you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation, either version 3 of the License, 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, see . +*/ + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "cpp.h" + +int process_file(const char *); +static void do_error(const char *f, ...); + +/* command line option handling */ +#define PROGVER "lwcc-cc from " PACKAGE_STRING +char *program_name; + +/* input files */ +lw_stringlist_t input_files; +lw_stringlist_t includedirs; +lw_stringlist_t sysincludedirs; +lw_stringlist_t macrolist; + +/* various flags */ +int trigraphs = 0; +char *output_file = NULL; +FILE *output_fp = NULL; + +static struct lw_cmdline_options options[] = +{ + { "output", 'o', "FILE", 0, "Output to FILE"}, + { "include", 'i', "FILE", 0, "Pre-include FILE" }, + { "includedir", 'I', "PATH", 0, "Add entry to the user include path" }, + { "sincludedir", 'S', "PATH", 0, "Add entry to the system include path" }, + { "define", 'D', "SYM[=VAL]",0, "Automatically define SYM to be VAL (or 1)"}, + { "trigraphs", 0x100, NULL, 0, "Enable interpretation of trigraphs" }, + { 0 } +}; + +static int parse_opts(int key, char *arg, void *state) +{ + switch (key) + { + case 'o': + if (output_file) + do_error("Output file specified more than once."); + output_file = arg; + break; + + case 0x100: + trigraphs = 1; + break; + + case 'I': + lw_stringlist_addstring(includedirs, arg); + break; + + case 'S': + lw_stringlist_addstring(sysincludedirs, arg); + break; + + case 'D': + lw_stringlist_addstring(macrolist, arg); + break; + + case lw_cmdline_key_end: + break; + + case lw_cmdline_key_arg: + lw_stringlist_addstring(input_files, arg); + break; + + default: + return lw_cmdline_err_unknown; + } + return 0; +} + +static struct lw_cmdline_parser cmdline_parser = +{ + options, + parse_opts, + "INPUTFILE", + "lwcc-cc - C compiler for lwcc", + PROGVER +}; + +int main(int argc, char **argv) +{ + program_name = argv[0]; + int retval = 0; + + input_files = lw_stringlist_create(); + includedirs = lw_stringlist_create(); + sysincludedirs = lw_stringlist_create(); + macrolist = lw_stringlist_create(); + + /* parse command line arguments */ + lw_cmdline_parse(&cmdline_parser, argc, argv, 0, 0, NULL); + + /* set up output file */ + if (output_file == NULL || strcmp(output_file, "-") == 0) + { + output_fp = stdout; + } + else + { + output_fp = fopen(output_file, "wb"); + if (output_fp == NULL) + { + do_error("Failed to create output file %s: %s", output_file, strerror(errno)); + } + } + + if (lw_stringlist_nstrings(input_files) == 0) + { + /* if no input files, work on stdin */ + retval = process_file("-"); + } + else + { + char *s; + lw_stringlist_reset(input_files); + for (s = lw_stringlist_current(input_files); s; s = lw_stringlist_next(input_files)) + { + retval = process_file(s); + if (retval != 0) + break; + } + } + lw_stringlist_destroy(input_files); + lw_stringlist_destroy(includedirs); + lw_stringlist_destroy(sysincludedirs); + lw_stringlist_destroy(macrolist); + exit(retval); +} + +static void print_line_marker(FILE *fp, int line, const char *fn, int flag) +{ + fprintf(fp, "\n# %d \"", line); + while (*fn) + { + if (*fn < 32 || *fn == 34 || *fn > 126) + { + fprintf(fp, "\\%03o", *fn); + } + else + { + fprintf(fp, "%c", *fn); + } + fn++; + } + fprintf(fp, "\" %d", flag); +} + +int process_file(const char *fn) +{ + struct preproc_info *pp; + struct token *tok = NULL; + int last_line = 0; + char *last_fn = NULL; + char *tstr; + + pp = preproc_init(fn); + if (!pp) + return -1; + + /* set up the include paths */ + lw_stringlist_reset(includedirs); + for (tstr = lw_stringlist_current(includedirs); tstr; tstr = lw_stringlist_next(includedirs)) + { + preproc_add_include(pp, tstr, 0); + } + + lw_stringlist_reset(sysincludedirs); + for (tstr = lw_stringlist_current(sysincludedirs); tstr; tstr = lw_stringlist_next(sysincludedirs)) + { + preproc_add_include(pp, tstr, 1); + } + + /* set up pre-defined macros */ + lw_stringlist_reset(macrolist); + for (tstr = lw_stringlist_current(macrolist); tstr; tstr = lw_stringlist_next(macrolist)) + { + preproc_add_macro(pp, tstr); + } + + print_line_marker(output_fp, 1, fn, 1); + last_fn = lw_strdup(fn); + for (;;) + { + tok = preproc_next(pp); + if (tok -> ttype == TOK_EOF) + break; + if (strcmp(tok -> fn, last_fn) != 0) + { + int lt = 1; + if (tok -> lineno != 1) + { + lt = 2; + } + lw_free(last_fn); + last_fn = lw_strdup(tok -> fn); + last_line = tok -> lineno; + print_line_marker(output_fp, last_line, last_fn, lt); + } + else + { + while (tok -> lineno > last_line) + { + fprintf(output_fp, "\n"); + last_line++; + } + } + token_print(tok, output_fp); + if (tok -> ttype == TOK_EOL) + last_line++; + token_free(tok); + } + token_free(tok); + lw_free(last_fn); +// symtab_dump(pp); + preproc_finish(pp); + return 0; +} + +static void do_error(const char *f, ...) +{ + va_list args; + va_start(args, f); + fprintf(stderr, "ERROR: "); + vfprintf(stderr, f, args); + va_end(args); + fprintf(stderr, "\n"); + exit(1); +}