Undo part of incr_offset patch.

The incr_offset offset code was not working with bounds checking. So I reverted part of tccgen.c. See new test code 132. Also added some debugging code that prints location of bounds checking calls. Needed this to find the problem. See lib/bcheck.c, lib/bt-dll.c, lib/bt-exe.c, lib/bt-log.c, tccrun.c

herman ten brugge committed 3 years ago

Commit 598134f1 parent d1c10778 files · +96 −5Browse files

Showing the changes to lib (4 of 8 files). Show all

Unified · Split

4 files

lib/bcheck.c +9 −1
lib/bt-dll.c +1 −0
lib/bt-exe.c +2 −0
lib/bt-log.c +10 −0

lib/bcheck.c+9−1

 #define BOUND_STATISTIC         (1)
 #if BOUND_DEBUG
- #define dprintf(a...)         if (print_calls) fprintf(a)
+ #define dprintf(a...)         if (print_calls) { bounds_loc; fprintf(a); }
 #else
  #define dprintf(a...)
 #endif
 #endif
 int tcc_backtrace(const char *fmt, ...);
+void tcc_location(const char *fmt);
 /* print a bound error message */
 #define bound_warning(...) \
             exit(255);              \
     } while (0)
+#define bounds_loc \
+    do {                            \
+        WAIT_SEM (); \
+        tcc_location("^bcheck.c^"); \
+        POST_SEM (); \
+    } while (0)
 static void bound_alloc_error(const char *s)
 {
     fprintf(stderr,"FATAL: %s\n",s);

lib/bt-dll.c+1−0

@@ -8,6 +8,7 @@ · 7 unmodified lines
8	REDIR(__bt_init) \	8	REDIR(__bt_init) \
9	REDIR(__bt_exit) \	9	REDIR(__bt_exit) \
10	REDIR(tcc_backtrace) \	10	REDIR(tcc_backtrace) \
		11	REDIR(tcc_location) \
11	\	12	\
12	REDIR(__bound_ptr_add) \	13	REDIR(__bound_ptr_add) \
13	REDIR(__bound_ptr_indir1) \	14	REDIR(__bound_ptr_indir1) \

lib/bt-exe.c+2−0

 #include "../tccrun.c"
 int (*__rt_error)(void*, void*, const char *, va_list);
+void (*__rt_location)(void*, void*, const char *);
 __attribute__((weak)) void __bound_checking_lock(void);
 __attribute__((weak)) void __bound_checking_unlock(void);
         rc->num_callers = num_callers - 1;
         rc->top_func = main;
         __rt_error = _rt_error;
+        __rt_location = _rt_location;
         set_exception_handler();
     } else {
         p->next = rc->next, rc->next = p;

lib/bt-log.c+10−0

 #include <string.h>
 int (*__rt_error)(void*, void*, const char *, va_list);
+void (*__rt_location)(void*, void*, const char *);
 #ifdef _WIN32
 # define DLL_EXPORT __declspec(dllexport)
     return ret;
 }
+DLL_EXPORT void tcc_location(const char *fmt)
+{
+    if (__rt_location) {
+        void *fp = __builtin_frame_address(1);
+        void *ip = __builtin_return_address(0);
+        __rt_location(fp, ip, fmt);
+    }
+}
 #if (defined(__GNUC__) && (__GNUC__ >= 6)) || defined(__clang__)
 #pragma GCC diagnostic pop
 #endif

Undo part of incr_offset patch.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code