gcc 3.4 compile fix

This commit is contained in:
bellard 2004-11-07 15:43:33 +00:00
parent 6bbfb8f610
commit 398e22c541

View file

@ -74,19 +74,7 @@ void __bound_init(void);
void __bound_new_region(void *p, unsigned long size); void __bound_new_region(void *p, unsigned long size);
int __bound_delete_region(void *p); int __bound_delete_region(void *p);
/* currently, tcc cannot compile that because we use unsupported GNU C #define FASTCALL __attribute__((regparm(3)))
extensions */
#if !defined(__TINYC__)
void *__bound_ptr_add(void *p, int offset) __attribute__((regparm(2)));
void *__bound_ptr_indir1(void *p, int offset) __attribute__((regparm(2)));
void *__bound_ptr_indir2(void *p, int offset) __attribute__((regparm(2)));
void *__bound_ptr_indir4(void *p, int offset) __attribute__((regparm(2)));
void *__bound_ptr_indir8(void *p, int offset) __attribute__((regparm(2)));
void *__bound_ptr_indir12(void *p, int offset) __attribute__((regparm(2)));
void *__bound_ptr_indir16(void *p, int offset) __attribute__((regparm(2)));
void __bound_local_new(void *p) __attribute__((regparm(1)));
void __bound_local_delete(void *p) __attribute__((regparm(1)));
#endif
void *__bound_malloc(size_t size, const void *caller); void *__bound_malloc(size_t size, const void *caller);
void *__bound_memalign(size_t size, size_t align, const void *caller); void *__bound_memalign(size_t size, size_t align, const void *caller);
@ -168,7 +156,7 @@ static void bound_alloc_error(void)
/* return '(p + offset)' for pointer arithmetic (a pointer can reach /* return '(p + offset)' for pointer arithmetic (a pointer can reach
the end of a region in this case */ the end of a region in this case */
void *__bound_ptr_add(void *p, int offset) void * FASTCALL __bound_ptr_add(void *p, int offset)
{ {
unsigned long addr = (unsigned long)p; unsigned long addr = (unsigned long)p;
BoundEntry *e; BoundEntry *e;
@ -194,7 +182,7 @@ void *__bound_ptr_add(void *p, int offset)
/* return '(p + offset)' for pointer indirection (the resulting must /* return '(p + offset)' for pointer indirection (the resulting must
be strictly inside the region */ be strictly inside the region */
#define BOUND_PTR_INDIR(dsize) \ #define BOUND_PTR_INDIR(dsize) \
void *__bound_ptr_indir ## dsize (void *p, int offset) \ void * FASTCALL __bound_ptr_indir ## dsize (void *p, int offset) \
{ \ { \
unsigned long addr = (unsigned long)p; \ unsigned long addr = (unsigned long)p; \
BoundEntry *e; \ BoundEntry *e; \
@ -227,7 +215,7 @@ void *__bound_ptr_indir ## dsize (void *p, int offset) \
#endif #endif
/* called when entering a function to add all the local regions */ /* called when entering a function to add all the local regions */
void __bound_local_new(void *p1) void FASTCALL __bound_local_new(void *p1)
{ {
unsigned long addr, size, fp, *p = p1; unsigned long addr, size, fp, *p = p1;
GET_CALLER_FP(fp); GET_CALLER_FP(fp);
@ -243,7 +231,7 @@ void __bound_local_new(void *p1)
} }
/* called when leaving a function to delete all the local regions */ /* called when leaving a function to delete all the local regions */
void __bound_local_delete(void *p1) void FASTCALL __bound_local_delete(void *p1)
{ {
unsigned long addr, fp, *p = p1; unsigned long addr, fp, *p = p1;
GET_CALLER_FP(fp); GET_CALLER_FP(fp);