History

misc. fixes

- tccgen: error out for cast to void, as in void foo(void) { return 1; } This avoids an assertion failure in x86_64-gen.c, also. also fix tests2/03_struct.c accordingly - Error: "memory full" - be more specific - Makefiles: remove circular dependencies, lookup tcctest.c from VPATH - tcc.h: cleanup lib, include, crt and libgcc search paths" avoid duplication or trailing slashes with no CONFIG_MULTIARCHDIR (as from 9382d6f1a0e2d0104a82ed805207d9e742c6b068) - tcc.h: remove ";{B}" from PE search path in ce5e12c2f950052d8109b6b7a56d900547705c08 James Lyon wrote: "... I'm not sure this is the right way to fix this problem." And the answer is: No, please. (copying libtcc1.a for tests instead) - win32/build_tcc.bat: do not move away a versioned file

grischka committed 12 years ago

Commit 2bd0daa1 parent d44364410 files · +46 −54Browse files

Unified · Split

10 files
  1. Makefile +0 −3
  2. lib/Makefile +0 −3
  3. libtcc.c +2 −2
  4. tcc.h +15 −15
  5. tccgen.c +4 −4
  6. tccpp.c +2 −2
  7. tests/Makefile +20 −19
  8. tests/tests2/03_struct.c +1 −1
  9. tests/tests2/Makefile +0 −3
  10. win32/build-tcc.bat +2 −2
Makefile+0−3
@@ -362,9 +362,6 @@ tar: tcc-doc.html · 361 unmodified lines
362362 rm -rf $(TCC-VERSION)
363363 git reset
364364
365−Makefile: $(top_srcdir)/Makefile
366− cp $< $@
367−
368365 .PHONY: all clean tar distclean install uninstall FORCE
369366
370367 endif # ifeq ($(TOP),.)
lib/Makefile+0−3
@@ -111,6 +111,3 @@ $(DIR)/exists : · 110 unmodified lines
111111
112112 clean :
113113 rm -rfv i386-win32 x86_64-win32 i386 x86_64
114−
115−Makefile: $(top_srcdir)/lib/Makefile
116− cp $< $@
libtcc.c+2−2
@@ -214,7 +214,7 @@ PUB_FUNC void *tcc_malloc(unsigned long size) · 213 unmodified lines
214214 void *ptr;
215215 ptr = malloc(size);
216216 if (!ptr && size)
217− tcc_error("memory full");
217+ tcc_error("memory full (malloc)");
218218 #ifdef MEM_DEBUG
219219 mem_cur_size += malloc_usable_size(ptr);
220220 if (mem_cur_size > mem_max_size)
@@ -239,7 +239,7 @@ PUB_FUNC void *tcc_realloc(void *ptr, unsigned long size) · 18 unmodified lines
239239 #endif
240240 ptr1 = realloc(ptr, size);
241241 if (!ptr1 && size)
242− tcc_error("memory full");
242+ tcc_error("memory full (realloc)");
243243 #ifdef MEM_DEBUG
244244 /* NOTE: count not correct if alloc error, but not critical */
245245 mem_cur_size += malloc_usable_size(ptr1);
tcc.h+15−15
@@ -169,13 +169,18 @@ · 168 unmodified lines
169169 #ifndef CONFIG_LDDIR
170170 # define CONFIG_LDDIR "lib"
171171 #endif
172−#ifndef CONFIG_MULTIARCHDIR
173−#define CONFIG_MULTIARCHDIR
172+
173+#ifdef CONFIG_MULTIARCHDIR
174+# define USE_MUADIR(s) s "/" CONFIG_MULTIARCHDIR
175+# define ALSO_MUADIR(s) s "/" CONFIG_MULTIARCHDIR ":" s
176+#else
177+# define USE_MUADIR(s) s
178+# define ALSO_MUADIR(s) s
174179 #endif
175180
176181 /* path to find crt1.o, crti.o and crtn.o */
177182 #ifndef CONFIG_TCC_CRTPREFIX
178−# define CONFIG_TCC_CRTPREFIX CONFIG_SYSROOT "/usr/" CONFIG_LDDIR "/" CONFIG_MULTIARCHDIR
183+# define CONFIG_TCC_CRTPREFIX USE_MUADIR(CONFIG_SYSROOT "/usr/" CONFIG_LDDIR)
179184 #endif
180185
181186 /* Below: {B} is substituted by CONFIG_TCCDIR (rsp. -B option) */
@@ -186,10 +191,8 @@ · 4 unmodified lines
186191 # define CONFIG_TCC_SYSINCLUDEPATHS "{B}/include;{B}/include/winapi"
187192 # else
188193 # define CONFIG_TCC_SYSINCLUDEPATHS \
189− CONFIG_SYSROOT "/usr/local/include/" CONFIG_MULTIARCHDIR \
190− ":" CONFIG_SYSROOT "/usr/local/include" \
191− ":" CONFIG_SYSROOT "/usr/include/" CONFIG_MULTIARCHDIR \
192− ":" CONFIG_SYSROOT "/usr/include" \
194+ ALSO_MUADIR(CONFIG_SYSROOT "/usr/local/include") \
195+ ":" ALSO_MUADIR(CONFIG_SYSROOT "/usr/include") \
193196 ":" "{B}/include"
194197 # endif
195198 #endif
@@ -197,15 +200,12 @@ · 1 unmodified line
197200 /* library search paths */
198201 #ifndef CONFIG_TCC_LIBPATHS
199202 # ifdef TCC_TARGET_PE
200−# define CONFIG_TCC_LIBPATHS "{B}/lib;{B}"
203+# define CONFIG_TCC_LIBPATHS "{B}/lib"
201204 # else
202205 # define CONFIG_TCC_LIBPATHS \
203− CONFIG_SYSROOT "/usr/" CONFIG_LDDIR "/" CONFIG_MULTIARCHDIR \
204− ":" CONFIG_SYSROOT "/usr/" CONFIG_LDDIR \
205− ":" CONFIG_SYSROOT "/" CONFIG_LDDIR "/" CONFIG_MULTIARCHDIR \
206− ":" CONFIG_SYSROOT "/" CONFIG_LDDIR \
207− ":" CONFIG_SYSROOT "/usr/local/" CONFIG_LDDIR "/" CONFIG_MULTIARCHDIR \
208− ":" CONFIG_SYSROOT "/usr/local/" CONFIG_LDDIR
206+ ALSO_MUADIR(CONFIG_SYSROOT "/usr/" CONFIG_LDDIR) \
207+ ":" ALSO_MUADIR(CONFIG_SYSROOT "/" CONFIG_LDDIR) \
208+ ":" ALSO_MUADIR(CONFIG_SYSROOT "/usr/local/" CONFIG_LDDIR)
209209 # endif
210210 #endif
211211
@@ -237,7 +237,7 @@ · 25 unmodified lines
237237 #endif
238238
239239 /* library to use with CONFIG_USE_LIBGCC instead of libtcc1.a */
240−#define TCC_LIBGCC CONFIG_SYSROOT "/" CONFIG_LDDIR "/" CONFIG_MULTIARCHDIR "/libgcc_s.so.1"
240+#define TCC_LIBGCC USE_MUADIR(CONFIG_SYSROOT "/" CONFIG_LDDIR) "/libgcc_s.so.1"
241241
242242 /* -------------------------------------------- */
243243 /* include the target specific definitions */
tccgen.c+4−4
@@ -309,7 +309,7 @@ static void vsetc(CType *type, int r, CValue *vc) · 308 unmodified lines
309309 int v;
310310
311311 if (vtop >= vstack + (VSTACK_SIZE - 1))
312− tcc_error("memory full");
312+ tcc_error("memory full (vstack)");
313313 /* cannot let cpu flags if other instruction are generated. Also
314314 avoid leaving VT_JMP anywhere except on the top of the stack
315315 because it would complicate the code generator. */
@@ -483,7 +483,7 @@ ST_FUNC void vswap(void) · 167 unmodified lines
483483 ST_FUNC void vpushv(SValue *v)
484484 {
485485 if (vtop >= vstack + (VSTACK_SIZE - 1))
486− tcc_error("memory full");
486+ tcc_error("memory full (vstack)");
487487 vtop++;
488488 *vtop = *v;
489489 }
@@ -2348,8 +2348,8 @@ static void gen_assign_cast(CType *dt) · 1858 unmodified lines
23482348 st = &vtop->type; /* source type */
23492349 dbt = dt->t & VT_BTYPE;
23502350 sbt = st->t & VT_BTYPE;
2351− if (sbt == VT_VOID)
2352− tcc_error("Cannot assign void value");
2351+ if (sbt == VT_VOID || dbt == VT_VOID)
2352+ tcc_error("cannot cast from/to void");
23532353 if (dt->t & VT_CONSTANT)
23542354 tcc_warning("assignment of read-only location");
23552355 switch(dbt) {
tccpp.c+2−2
@@ -197,7 +197,7 @@ static TokenSym *tok_alloc_new(TokenSym **pts, const char *str, int len) · 196 unmodified lines
197197 int i;
198198
199199 if (tok_ident >= SYM_FIRST_ANOM)
200− tcc_error("memory full");
200+ tcc_error("memory full (symbols)");
201201
202202 /* expand token table if needed */
203203 i = tok_ident - TOK_IDENT;
@@ -1528,7 +1528,7 @@ include_done: · 1324 unmodified lines
15281528 c = (define_find(tok) != 0) ^ c;
15291529 do_if:
15301530 if (s1->ifdef_stack_ptr >= s1->ifdef_stack + IFDEF_STACK_SIZE)
1531− tcc_error("memory full");
1531+ tcc_error("memory full (ifdef)");
15321532 *s1->ifdef_stack_ptr++ = c;
15331533 goto test_skip;
15341534 case TOK_ELSE:
tests/Makefile+20−19
@@ -27,7 +27,7 @@ ifneq ($(ARCH),i386) · 26 unmodified lines
2727 TESTS := $(filter-out btest,$(TESTS))
2828 endif
2929 ifdef CONFIG_WIN32
30− TESTS := $(filter-out test3,$(TESTS))
30+ TESTS := w32-prep $(filter-out test3,$(TESTS))
3131 endif
3232 ifeq ($(TARGETOS),Darwin)
3333 TESTS := $(filter-out hello-exe test3 btest,$(TESTS))
@@ -84,6 +84,9 @@ moretests: · 50 unmodified lines
8484 @echo ------------ $@ ------------
8585 $(MAKE) -C tests2
8686
87+w32-prep:
88+ cp ../libtcc1.a ../lib
89+
8790 # test.ref - generate using gcc
8891 # copy only tcclib.h so GCC's stddef and stdarg will be used
8992 test.ref: tcctest.c
@@ -91,41 +94,41 @@ test.ref: tcctest.c · 1 unmodified line
9194 ./tcctest.gcc > $@
9295
9396 # auto test
94−test1: test.ref
97+test1: tcctest.c test.ref
9598 @echo ------------ $@ ------------
96− $(TCC) -run $(SRCDIR)/tcctest.c > test.out1
99+ $(TCC) -run $< > test.out1
97100 @if diff -u test.ref test.out1 ; then echo "Auto Test OK"; fi
98101
99102 # iterated test2 (compile tcc then compile tcctest.c !)
100−test2: test.ref
103+test2: tcctest.c test.ref
101104 @echo ------------ $@ ------------
102− $(TCC) $(RUN_TCC) $(RUN_TCC) -run $(SRCDIR)/tcctest.c > test.out2
105+ $(TCC) $(RUN_TCC) $(RUN_TCC) -run $< > test.out2
103106 @if diff -u test.ref test.out2 ; then echo "Auto Test2 OK"; fi
104107
105108 # iterated test3 (compile tcc then compile tcc then compile tcctest.c !)
106−test3: test.ref
109+test3: tcctest.c test.ref
107110 @echo ------------ $@ ------------
108− $(TCC) $(RUN_TCC) $(RUN_TCC) $(RUN_TCC) -run $(SRCDIR)/tcctest.c > test.out3
111+ $(TCC) $(RUN_TCC) $(RUN_TCC) $(RUN_TCC) -run $< > test.out3
109112 @if diff -u test.ref test.out3 ; then echo "Auto Test3 OK"; fi
110113
111114 # binary output test
112−test4: test.ref
115+test4: tcctest.c test.ref
113116 @echo ------------ $@ ------------
114117 # object + link output
115− $(TCC) -c -o tcctest3.o $(SRCDIR)/tcctest.c
118+ $(TCC) -c -o tcctest3.o $<
116119 $(TCC) -o tcctest3 tcctest3.o
117120 ./tcctest3 > test3.out
118121 @if diff -u test.ref test3.out ; then echo "Object Auto Test OK"; fi
119122 # dynamic output
120− $(TCC) -o tcctest1 $(SRCDIR)/tcctest.c
123+ $(TCC) -o tcctest1 $<
121124 ./tcctest1 > test1.out
122125 @if diff -u test.ref test1.out ; then echo "Dynamic Auto Test OK"; fi
123126 # dynamic output + bound check
124− $(TCC) -b -o tcctest4 $(SRCDIR)/tcctest.c
127+ $(TCC) -b -o tcctest4 $<
125128 ./tcctest4 > test4.out
126129 @if diff -u test.ref test4.out ; then echo "BCheck Auto Test OK"; fi
127130 # static output
128− $(TCC) -static -o tcctest2 $(SRCDIR)/tcctest.c
131+ $(TCC) -static -o tcctest2 $<
129132 ./tcctest2 > test2.out
130133 @if diff -u test.ref test2.out ; then echo "Static Auto Test OK"; fi
131134
@@ -161,9 +164,9 @@ speedtest: ex2 ex3 · 29 unmodified lines
161164 time ./ex3 35
162165 time $(TCC) -run $(top_srcdir)/examples/ex3.c 35
163166
164−weaktest: test.ref
165− $(TCC) -c tcctest.c -o weaktest.tcc.o $(CPPFLAGS) $(CFLAGS)
166− $(CC) -c tcctest.c -o weaktest.gcc.o -I. $(CPPFLAGS) -w $(CFLAGS)
167+weaktest: tcctest.c test.ref
168+ $(TCC) -c $< -o weaktest.tcc.o $(CPPFLAGS) $(CFLAGS)
169+ $(CC) -c $< -o weaktest.gcc.o -I. $(CPPFLAGS) -w $(CFLAGS)
167170 objdump -t weaktest.tcc.o | grep ' w ' | sed -e 's/.* \([a-zA-Z0-9_]*\)$$/\1/' | LC_ALL=C sort > weaktest.tcc.o.txt
168171 objdump -t weaktest.gcc.o | grep ' w ' | sed -e 's/.* \([a-zA-Z0-9_]*\)$$/\1/' | LC_ALL=C sort > weaktest.gcc.o.txt
169172 diff weaktest.gcc.o.txt weaktest.tcc.o.txt && echo "Weak Auto Test OK"
@@ -220,7 +223,5 @@ cache: tcc_g · 50 unmodified lines
220223 clean:
221224 $(MAKE) -C tests2 $@
222225 rm -vf *~ *.o *.a *.bin *.i *.ref *.out *.out? *.out?b *.gcc *.exe \
223− hello libtcc_test tcctest[1234] ex? tcc_g tcclib.h
224−
225−Makefile: $(SRCDIR)/Makefile
226− cp $< $@
226+ hello libtcc_test tcctest[1234] ex? tcc_g tcclib.h \
227+ ../lib/libtcc1.a
tests/tests2/03_struct.c+1−1
@@ -6,7 +6,7 @@ struct fred · 5 unmodified lines
66 int natasha;
77 };
88
9−void main()
9+int main()
1010 {
1111 struct fred bloggs;
1212
tests/tests2/Makefile+0−3
@@ -96,6 +96,3 @@ all test: $(TESTS) · 95 unmodified lines
9696
9797 clean:
9898 rm -vf fred.txt *.output
99−
100−Makefile: $(top_srcdir)/tests/tests2/Makefile
101− cp $< $@
win32/build-tcc.bat+2−2
@@ -63,5 +63,5 @@ del *.o · 62 unmodified lines
6363 echo>..\config.texi @set VERSION %VERSION%
6464 if not exist doc md doc
6565 makeinfo --html --no-split -o doc\tcc-doc.html ../tcc-doc.texi
66−if exist tcc-win32.txt move tcc-win32.txt doc\
67−copy ..\tests\libtcc_test.c examples\
66+copy tcc-win32.txt doc
67+copy ..\tests\libtcc_test.c examples

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t