fixes for previous commit

grischka committed 6 years ago

Commit 2b7cffa1 parent ef422955 files · +45 −40Browse files

Unified · Split

5 files

tcc.h +3 −0
tccelf.c +5 −5
tccrun.c +7 −5
tests/tests2/112_backtrace.expect +29 −29
tests/tests2/Makefile +1 −1

@@ -150,9 +150,12 @@ extern long double strtold (const char __nptr, char *__endptr); · 149 unmodified lines
150	150	# elif defined __arm__
151	151	# define TCC_TARGET_ARM
152	152	# define TCC_ARM_EABI
	153	+# define TCC_ARM_VFP
153	154	# define TCC_ARM_HARDFLOAT
154	155	# elif defined __aarch64__
155	156	# define TCC_TARGET_ARM64
	157	+# elif defined __riscv
	158	+# define TCC_TARGET_RISCV64
156	159	# else
157	160	# define TCC_TARGET_I386
158	161	# endif

tccelf.c+5−5

@@ -1359,7 +1359,7 @@ static void set_local_sym(TCCState s1, const char name, Section *s, int offset · 1358 unmodified lines
1359	1359	ST_FUNC void tcc_add_btstub(TCCState *s1)
1360	1360	{
1361	1361	Section *s;
1362		− int n, o, b;
	1362	+ int n, o;
1363	1363	CString cstr;
1364	1364
1365	1365	s = data_section;
@@ -1372,11 +1372,11 @@ ST_FUNC void tcc_add_btstub(TCCState *s1) · 6 unmodified lines
1372	1372	/* prog_base */
1373	1373	put_elf_reloc(s1->symtab, s, s->data_offset, R_DATA_PTR, 0);
1374	1374	section_ptr_add(s, PTR_SIZE);
1375		− n = 2 * PTR_SIZE, b = 0;
	1375	+ n = 2 * PTR_SIZE;
1376	1376	#ifdef CONFIG_TCC_BCHECK
1377	1377	if (s1->do_bounds_check) {
1378	1378	put_ptr(s1, bounds_section, 0);
1379		− n -= PTR_SIZE, b = 1;
	1379	+ n -= PTR_SIZE;
1380	1380	}
1381	1381	#endif
1382	1382	section_ptr_add(s, n);
@@ -1386,8 +1386,8 @@ ST_FUNC void tcc_add_btstub(TCCState *s1) · 3 unmodified lines
1386	1386	" extern void __bt_init(),*__rt_info[],__bt_init_dll();"
1387	1387	"__attribute__((constructor)) static void __bt_init_rt(){");
1388	1388	#ifdef TCC_TARGET_PE
1389		− if (s1->output_type == TCC_OUTPUT_DLL)
1390		− cstr_printf(&cstr, "__bt_init_dll(%d);", b);
	1389	+ if (s1->output_type == TCC_OUTPUT_DLL)
	1390	+ cstr_printf(&cstr, "__bt_init_dll(%d);", s1->do_bounds_check);
1391	1391	#endif
1392	1392	cstr_printf(&cstr, "__bt_init(__rt_info,%d);}",
1393	1393	s1->output_type == TCC_OUTPUT_DLL ? 0 : s1->rt_num_callers + 1);

tccrun.c+7−5

@@ -161,6 +161,9 @@ LIBTCCAPI int tcc_run(TCCState s1, int argc, char *argv) · 160 unmodified lines
161	161	rc->esym_start = (ElfW(Sym) *)(symtab_section->data);
162	162	rc->esym_end = (ElfW(Sym) *)(symtab_section->data + symtab_section->data_offset);
163	163	rc->elf_str = (char *)symtab_section->link->data;
	164	+#if PTR_SIZE == 8
	165	+ rc->prog_base = text_section->sh_addr & 0xffffffff00000000ULL;
	166	+#endif
164	167	rc->top_func = tcc_get_symbol(s1, "main");
165	168	rc->num_callers = s1->rt_num_callers;
166	169	rc->do_jmp = 1;
@@ -405,11 +408,10 @@ next: · 238 unmodified lines
405	408	if (sym->n_strx == 0) /* end of function */
406	409	goto rel_pc;
407	410	abs_pc:
408		− if (sizeof sym->n_value < PTR_SIZE) {
409		− /* Stab_Sym.n_value is only 32bits */
410		− //fprintf(stderr, "pc = %p %p %p\n", pc, rc->prog_base, wanted_pc), fflush(stderr);
411		− pc += rc->prog_base;
412		− }
	411	+#if PTR_SIZE == 8
	412	+ /* Stab_Sym.n_value is only 32bits */
	413	+ pc += rc->prog_base;
	414	+#endif
413	415	break;
414	416	rel_pc:
415	417	pc += func_addr;

tests/tests2/112_backtrace.expect+29−29

@@ -14,7 +14,7 @@ · 13 unmodified lines
14	14	* f1()
15	15	112_backtrace.c:38: at f1: BCHECK: ........ is outside of the region
16	16	112_backtrace.c:43: by main
17		−112_backtrace.c:38: at f1: BCHECK: invalid pointer ........, size 0x14 in memmove dest
	17	+112_backtrace.c:38: at f1: BCHECK: invalid pointer ........, size 0x? in memmove dest
18	18	112_backtrace.c:43: by main
19	19	[returns 255]
20	20
@@ -33,132 +33,132 @@ · 12 unmodified lines
33	33
34	34	[test_bcheck_100]
35	35	112_backtrace.c:107: at main: BCHECK: ........ is outside of the region
36		−112_backtrace.c:107: at main: BCHECK: invalid pointer ........, size 0xa in memcpy dest
	36	+112_backtrace.c:107: at main: BCHECK: invalid pointer ........, size 0x? in memcpy dest
37	37	[returns 255]
38	38
39	39	[test_bcheck_101]
40	40	112_backtrace.c:109: at main: BCHECK: ........ is outside of the region
41		−112_backtrace.c:109: at main: BCHECK: invalid pointer ........, size 0xa in memcpy src
	41	+112_backtrace.c:109: at main: BCHECK: invalid pointer ........, size 0x? in memcpy src
42	42	[returns 255]
43	43
44	44	[test_bcheck_102]
45		−112_backtrace.c:111: at main: BCHECK: overlapping regions ........(0x4), ........(0x4) in memcpy
	45	+112_backtrace.c:111: at main: BCHECK: overlapping regions ........(0x?), ........(0x?) in memcpy
46	46	[returns 255]
47	47
48	48	[test_bcheck_103]
49		−112_backtrace.c:113: at main: BCHECK: overlapping regions ........(0x4), ........(0x4) in memcpy
	49	+112_backtrace.c:113: at main: BCHECK: overlapping regions ........(0x?), ........(0x?) in memcpy
50	50	[returns 255]
51	51
52	52	[test_bcheck_104]
53	53	112_backtrace.c:115: at main: BCHECK: ........ is outside of the region
54		−112_backtrace.c:115: at main: BCHECK: invalid pointer ........, size 0xa in memcmp s1
	54	+112_backtrace.c:115: at main: BCHECK: invalid pointer ........, size 0x? in memcmp s1
55	55	[returns 255]
56	56
57	57	[test_bcheck_105]
58	58	112_backtrace.c:117: at main: BCHECK: ........ is outside of the region
59		−112_backtrace.c:117: at main: BCHECK: invalid pointer ........, size 0xa in memcmp s2
	59	+112_backtrace.c:117: at main: BCHECK: invalid pointer ........, size 0x? in memcmp s2
60	60	[returns 255]
61	61
62	62	[test_bcheck_106]
63	63	112_backtrace.c:119: at main: BCHECK: ........ is outside of the region
64		−112_backtrace.c:119: at main: BCHECK: invalid pointer ........, size 0xa in memmove dest
	64	+112_backtrace.c:119: at main: BCHECK: invalid pointer ........, size 0x? in memmove dest
65	65	[returns 255]
66	66
67	67	[test_bcheck_107]
68	68	112_backtrace.c:121: at main: BCHECK: ........ is outside of the region
69		−112_backtrace.c:121: at main: BCHECK: invalid pointer ........, size 0xa in memmove src
	69	+112_backtrace.c:121: at main: BCHECK: invalid pointer ........, size 0x? in memmove src
70	70	[returns 255]
71	71
72	72	[test_bcheck_108]
73	73	112_backtrace.c:123: at main: BCHECK: ........ is outside of the region
74		−112_backtrace.c:123: at main: BCHECK: invalid pointer ........, size 0xa in memset
	74	+112_backtrace.c:123: at main: BCHECK: invalid pointer ........, size 0x? in memset
75	75	[returns 255]
76	76
77	77	[test_bcheck_109]
78	78	112_backtrace.c:125: at main: BCHECK: ........ is outside of the region
79		−112_backtrace.c:125: at main: BCHECK: invalid pointer ........, size 0xb in strlen
	79	+112_backtrace.c:125: at main: BCHECK: invalid pointer ........, size 0x? in strlen
80	80	[returns 255]
81	81
82	82	[test_bcheck_110]
83	83	112_backtrace.c:127: at main: BCHECK: ........ is outside of the region
84		−112_backtrace.c:127: at main: BCHECK: invalid pointer ........, size 0x4 in strcpy dest
	84	+112_backtrace.c:127: at main: BCHECK: invalid pointer ........, size 0x? in strcpy dest
85	85	[returns 255]
86	86
87	87	[test_bcheck_111]
88	88	112_backtrace.c:129: at main: BCHECK: ........ is outside of the region
89		−112_backtrace.c:129: at main: BCHECK: invalid pointer ........, size 0x4 in strcpy src
	89	+112_backtrace.c:129: at main: BCHECK: invalid pointer ........, size 0x? in strcpy src
90	90	[returns 255]
91	91
92	92	[test_bcheck_112]
93		−112_backtrace.c:131: at main: BCHECK: overlapping regions ........(0x3), ........(0x3) in strcpy
	93	+112_backtrace.c:131: at main: BCHECK: overlapping regions ........(0x?), ........(0x?) in strcpy
94	94	[returns 255]
95	95
96	96	[test_bcheck_113]
97		−112_backtrace.c:133: at main: BCHECK: overlapping regions ........(0x4), ........(0x4) in strcpy
	97	+112_backtrace.c:133: at main: BCHECK: overlapping regions ........(0x?), ........(0x?) in strcpy
98	98	[returns 255]
99	99
100	100	[test_bcheck_114]
101	101	112_backtrace.c:135: at main: BCHECK: ........ is outside of the region
102		−112_backtrace.c:135: at main: BCHECK: invalid pointer ........, size 0x4 in strncpy dest
	102	+112_backtrace.c:135: at main: BCHECK: invalid pointer ........, size 0x? in strncpy dest
103	103	[returns 255]
104	104
105	105	[test_bcheck_115]
106	106	112_backtrace.c:137: at main: BCHECK: ........ is outside of the region
107		−112_backtrace.c:137: at main: BCHECK: invalid pointer ........, size 0x4 in strncpy src
	107	+112_backtrace.c:137: at main: BCHECK: invalid pointer ........, size 0x? in strncpy src
108	108	[returns 255]
109	109
110	110	[test_bcheck_116]
111		−112_backtrace.c:139: at main: BCHECK: overlapping regions ........(0x3), ........(0x3) in strncpy
	111	+112_backtrace.c:139: at main: BCHECK: overlapping regions ........(0x?), ........(0x?) in strncpy
112	112	[returns 255]
113	113
114	114	[test_bcheck_117]
115		−112_backtrace.c:141: at main: BCHECK: overlapping regions ........(0x4), ........(0x4) in strncpy
	115	+112_backtrace.c:141: at main: BCHECK: overlapping regions ........(0x?), ........(0x?) in strncpy
116	116	[returns 255]
117	117
118	118	[test_bcheck_118]
119	119	112_backtrace.c:143: at main: BCHECK: ........ is outside of the region
120		−112_backtrace.c:143: at main: BCHECK: invalid pointer ........, size 0x9 in strcmp s1
	120	+112_backtrace.c:143: at main: BCHECK: invalid pointer ........, size 0x? in strcmp s1
121	121	[returns 255]
122	122
123	123	[test_bcheck_119]
124	124	112_backtrace.c:145: at main: BCHECK: ........ is outside of the region
125		−112_backtrace.c:145: at main: BCHECK: invalid pointer ........, size 0x9 in strcmp s2
	125	+112_backtrace.c:145: at main: BCHECK: invalid pointer ........, size 0x? in strcmp s2
126	126	[returns 255]
127	127
128	128	[test_bcheck_120]
129	129	112_backtrace.c:147: at main: BCHECK: ........ is outside of the region
130		−112_backtrace.c:147: at main: BCHECK: invalid pointer ........, size 0x6 in strncmp s1
	130	+112_backtrace.c:147: at main: BCHECK: invalid pointer ........, size 0x? in strncmp s1
131	131	[returns 255]
132	132
133	133	[test_bcheck_121]
134	134	112_backtrace.c:149: at main: BCHECK: ........ is outside of the region
135		−112_backtrace.c:149: at main: BCHECK: invalid pointer ........, size 0x6 in strncmp s2
	135	+112_backtrace.c:149: at main: BCHECK: invalid pointer ........, size 0x? in strncmp s2
136	136	[returns 255]
137	137
138	138	[test_bcheck_122]
139	139	112_backtrace.c:151: at main: BCHECK: ........ is outside of the region
140		−112_backtrace.c:151: at main: BCHECK: invalid pointer ........, size 0x6 in strcat dest
	140	+112_backtrace.c:151: at main: BCHECK: invalid pointer ........, size 0x? in strcat dest
141	141	[returns 255]
142	142
143	143	[test_bcheck_123]
144	144	112_backtrace.c:153: at main: BCHECK: ........ is outside of the region
145		−112_backtrace.c:153: at main: BCHECK: invalid pointer ........, size 0x6 in strcat src
	145	+112_backtrace.c:153: at main: BCHECK: invalid pointer ........, size 0x? in strcat src
146	146	[returns 255]
147	147
148	148	[test_bcheck_124]
149		−112_backtrace.c:155: at main: BCHECK: overlapping regions ........(0x9), ........(0x6) in strcat
	149	+112_backtrace.c:155: at main: BCHECK: overlapping regions ........(0x?), ........(0x?) in strcat
150	150	[returns 255]
151	151
152	152	[test_bcheck_125]
153		−112_backtrace.c:157: at main: BCHECK: overlapping regions ........(0x4), ........(0x4) in strcat
	153	+112_backtrace.c:157: at main: BCHECK: overlapping regions ........(0x?), ........(0x?) in strcat
154	154	[returns 255]
155	155
156	156	[test_bcheck_126]
157	157	112_backtrace.c:159: at main: BCHECK: ........ is outside of the region
158		−112_backtrace.c:159: at main: BCHECK: invalid pointer ........, size 0xb in strchr
	158	+112_backtrace.c:159: at main: BCHECK: invalid pointer ........, size 0x? in strchr
159	159	[returns 255]
160	160
161	161	[test_bcheck_127]
162	162	112_backtrace.c:161: at main: BCHECK: ........ is outside of the region
163		−112_backtrace.c:161: at main: BCHECK: invalid pointer ........, size 0xb in strdup
	163	+112_backtrace.c:161: at main: BCHECK: invalid pointer ........, size 0x? in strdup
164	164	[returns 255]

tests/tests2/Makefile+1−1

@@ -72,7 +72,7 @@ GEN-ALWAYS = · 71 unmodified lines
72	72	108_constructor.test: NORUN = true
73	73
74	74	112_backtrace.test: FLAGS += -dt -b
75		−112_backtrace.test: FILTER += -e 's;[0-9A-Fa-fx]\{8,\};........;g'
	75	+112_backtrace.test: FILTER += -e 's;[0-9A-Fa-fx]\{8,\};........;g' -e 's;0x[0-9A-Fa-f]\+;0x?;g'
76	76
77	77	# Filter source directory in warnings/errors (out-of-tree builds)
78	78	FILTER = 2>&1 \| sed -e 's,$(SRC)/,,g'

fixes for previous commit

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code