[llvm-commits] [compiler-rt] r100014 - in /compiler-rt/trunk/lib: absvdi2.c absvsi2.c absvti2.c addvdi3.c addvsi3.c addvti3.c clear_cache.c eprintf.c gcc_personality_v0.c int_lib.h mulvdi3.c mulvsi3.c mulvti3.c negvdi2.c negvsi2.c negvti2.c subvdi3.c subvsi3.c subvti3.c trampoline_setup.c
Daniel Dunbar
daniel at zuster.org
Wed Mar 31 10:00:45 PDT 2010
Author: ddunbar
Date: Wed Mar 31 12:00:45 2010
New Revision: 100014
URL: http://llvm.org/viewvc/llvm-project?rev=100014&view=rev
Log:
Use a private compilerrt_abort() define instead of calling abort directly.
- Fiddling with abort directly is annoying given the way we use system includes, although it would be nice to fix this so we could make sure calling abort directly is verboten.
Modified:
compiler-rt/trunk/lib/absvdi2.c
compiler-rt/trunk/lib/absvsi2.c
compiler-rt/trunk/lib/absvti2.c
compiler-rt/trunk/lib/addvdi3.c
compiler-rt/trunk/lib/addvsi3.c
compiler-rt/trunk/lib/addvti3.c
compiler-rt/trunk/lib/clear_cache.c
compiler-rt/trunk/lib/eprintf.c
compiler-rt/trunk/lib/gcc_personality_v0.c
compiler-rt/trunk/lib/int_lib.h
compiler-rt/trunk/lib/mulvdi3.c
compiler-rt/trunk/lib/mulvsi3.c
compiler-rt/trunk/lib/mulvti3.c
compiler-rt/trunk/lib/negvdi2.c
compiler-rt/trunk/lib/negvsi2.c
compiler-rt/trunk/lib/negvti2.c
compiler-rt/trunk/lib/subvdi3.c
compiler-rt/trunk/lib/subvsi3.c
compiler-rt/trunk/lib/subvti3.c
compiler-rt/trunk/lib/trampoline_setup.c
Modified: compiler-rt/trunk/lib/absvdi2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/absvdi2.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/absvdi2.c (original)
+++ compiler-rt/trunk/lib/absvdi2.c Wed Mar 31 12:00:45 2010
@@ -24,7 +24,7 @@
{
const int N = (int)(sizeof(di_int) * CHAR_BIT);
if (a == ((di_int)1 << (N-1)))
- abort();
+ compilerrt_abort();
const di_int t = a >> (N - 1);
return (a ^ t) - t;
}
Modified: compiler-rt/trunk/lib/absvsi2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/absvsi2.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/absvsi2.c (original)
+++ compiler-rt/trunk/lib/absvsi2.c Wed Mar 31 12:00:45 2010
@@ -24,7 +24,7 @@
{
const int N = (int)(sizeof(si_int) * CHAR_BIT);
if (a == (1 << (N-1)))
- abort();
+ compilerrt_abort();
const si_int t = a >> (N - 1);
return (a ^ t) - t;
}
Modified: compiler-rt/trunk/lib/absvti2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/absvti2.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/absvti2.c (original)
+++ compiler-rt/trunk/lib/absvti2.c Wed Mar 31 12:00:45 2010
@@ -26,7 +26,7 @@
{
const int N = (int)(sizeof(ti_int) * CHAR_BIT);
if (a == ((ti_int)1 << (N-1)))
- abort();
+ compilerrt_abort();
const ti_int s = a >> (N - 1);
return (a ^ s) - s;
}
Modified: compiler-rt/trunk/lib/addvdi3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/addvdi3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/addvdi3.c (original)
+++ compiler-rt/trunk/lib/addvdi3.c Wed Mar 31 12:00:45 2010
@@ -26,12 +26,12 @@
if (b >= 0)
{
if (s < a)
- abort();
+ compilerrt_abort();
}
else
{
if (s >= a)
- abort();
+ compilerrt_abort();
}
return s;
}
Modified: compiler-rt/trunk/lib/addvsi3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/addvsi3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/addvsi3.c (original)
+++ compiler-rt/trunk/lib/addvsi3.c Wed Mar 31 12:00:45 2010
@@ -26,12 +26,12 @@
if (b >= 0)
{
if (s < a)
- abort();
+ compilerrt_abort();
}
else
{
if (s >= a)
- abort();
+ compilerrt_abort();
}
return s;
}
Modified: compiler-rt/trunk/lib/addvti3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/addvti3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/addvti3.c (original)
+++ compiler-rt/trunk/lib/addvti3.c Wed Mar 31 12:00:45 2010
@@ -28,12 +28,12 @@
if (b >= 0)
{
if (s < a)
- abort();
+ compilerrt_abort();
}
else
{
if (s >= a)
- abort();
+ compilerrt_abort();
}
return s;
}
Modified: compiler-rt/trunk/lib/clear_cache.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/clear_cache.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/clear_cache.c (original)
+++ compiler-rt/trunk/lib/clear_cache.c Wed Mar 31 12:00:45 2010
@@ -33,7 +33,7 @@
/* On Darwin, sys_icache_invalidate() provides this functionality */
sys_icache_invalidate(start, end-start);
#else
- abort();
+ compilerrt_abort();
#endif
#endif
}
Modified: compiler-rt/trunk/lib/eprintf.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/eprintf.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/eprintf.c (original)
+++ compiler-rt/trunk/lib/eprintf.c Wed Mar 31 12:00:45 2010
@@ -10,6 +10,7 @@
+#include "int_lib.h"
#include <stdio.h>
#include <stdlib.h>
@@ -28,5 +29,5 @@
{
fprintf(stderr, format, assertion_expression, line, file);
fflush(stderr);
- abort();
+ compilerrt_abort();
}
Modified: compiler-rt/trunk/lib/gcc_personality_v0.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/gcc_personality_v0.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/gcc_personality_v0.c (original)
+++ compiler-rt/trunk/lib/gcc_personality_v0.c Wed Mar 31 12:00:45 2010
@@ -142,7 +142,7 @@
case DW_EH_PE_sleb128:
default:
/* not supported */
- abort();
+ compilerrt_abort();
break;
}
@@ -160,7 +160,7 @@
case DW_EH_PE_aligned:
default:
/* not supported */
- abort();
+ compilerrt_abort();
break;
}
Modified: compiler-rt/trunk/lib/int_lib.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/int_lib.h?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/int_lib.h (original)
+++ compiler-rt/trunk/lib/int_lib.h Wed Mar 31 12:00:45 2010
@@ -23,6 +23,8 @@
#include "endianness.h"
#include <math.h>
+#define compilerrt_abort() abort()
+
#if !defined(INFINITY) && defined(HUGE_VAL)
#define INFINITY HUGE_VAL
#endif /* INFINITY */
Modified: compiler-rt/trunk/lib/mulvdi3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/mulvdi3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/mulvdi3.c (original)
+++ compiler-rt/trunk/lib/mulvdi3.c Wed Mar 31 12:00:45 2010
@@ -29,13 +29,13 @@
{
if (b == 0 || b == 1)
return a * b;
- abort();
+ compilerrt_abort();
}
if (b == MIN)
{
if (a == 0 || a == 1)
return a * b;
- abort();
+ compilerrt_abort();
}
di_int sa = a >> (N - 1);
di_int abs_a = (a ^ sa) - sa;
@@ -46,12 +46,12 @@
if (sa == sb)
{
if (abs_a > MAX / abs_b)
- abort();
+ compilerrt_abort();
}
else
{
if (abs_a > MIN / -abs_b)
- abort();
+ compilerrt_abort();
}
return a * b;
}
Modified: compiler-rt/trunk/lib/mulvsi3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/mulvsi3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/mulvsi3.c (original)
+++ compiler-rt/trunk/lib/mulvsi3.c Wed Mar 31 12:00:45 2010
@@ -29,13 +29,13 @@
{
if (b == 0 || b == 1)
return a * b;
- abort();
+ compilerrt_abort();
}
if (b == MIN)
{
if (a == 0 || a == 1)
return a * b;
- abort();
+ compilerrt_abort();
}
si_int sa = a >> (N - 1);
si_int abs_a = (a ^ sa) - sa;
@@ -46,12 +46,12 @@
if (sa == sb)
{
if (abs_a > MAX / abs_b)
- abort();
+ compilerrt_abort();
}
else
{
if (abs_a > MIN / -abs_b)
- abort();
+ compilerrt_abort();
}
return a * b;
}
Modified: compiler-rt/trunk/lib/mulvti3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/mulvti3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/mulvti3.c (original)
+++ compiler-rt/trunk/lib/mulvti3.c Wed Mar 31 12:00:45 2010
@@ -31,13 +31,13 @@
{
if (b == 0 || b == 1)
return a * b;
- abort();
+ compilerrt_abort();
}
if (b == MIN)
{
if (a == 0 || a == 1)
return a * b;
- abort();
+ compilerrt_abort();
}
ti_int sa = a >> (N - 1);
ti_int abs_a = (a ^ sa) - sa;
@@ -48,12 +48,12 @@
if (sa == sb)
{
if (abs_a > MAX / abs_b)
- abort();
+ compilerrt_abort();
}
else
{
if (abs_a > MIN / -abs_b)
- abort();
+ compilerrt_abort();
}
return a * b;
}
Modified: compiler-rt/trunk/lib/negvdi2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/negvdi2.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/negvdi2.c (original)
+++ compiler-rt/trunk/lib/negvdi2.c Wed Mar 31 12:00:45 2010
@@ -24,6 +24,6 @@
{
const di_int MIN = (di_int)1 << ((int)(sizeof(di_int) * CHAR_BIT)-1);
if (a == MIN)
- abort();
+ compilerrt_abort();
return -a;
}
Modified: compiler-rt/trunk/lib/negvsi2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/negvsi2.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/negvsi2.c (original)
+++ compiler-rt/trunk/lib/negvsi2.c Wed Mar 31 12:00:45 2010
@@ -24,6 +24,6 @@
{
const si_int MIN = (si_int)1 << ((int)(sizeof(si_int) * CHAR_BIT)-1);
if (a == MIN)
- abort();
+ compilerrt_abort();
return -a;
}
Modified: compiler-rt/trunk/lib/negvti2.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/negvti2.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/negvti2.c (original)
+++ compiler-rt/trunk/lib/negvti2.c Wed Mar 31 12:00:45 2010
@@ -26,7 +26,7 @@
{
const ti_int MIN = (ti_int)1 << ((int)(sizeof(ti_int) * CHAR_BIT)-1);
if (a == MIN)
- abort();
+ compilerrt_abort();
return -a;
}
Modified: compiler-rt/trunk/lib/subvdi3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/subvdi3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/subvdi3.c (original)
+++ compiler-rt/trunk/lib/subvdi3.c Wed Mar 31 12:00:45 2010
@@ -26,12 +26,12 @@
if (b >= 0)
{
if (s > a)
- abort();
+ compilerrt_abort();
}
else
{
if (s <= a)
- abort();
+ compilerrt_abort();
}
return s;
}
Modified: compiler-rt/trunk/lib/subvsi3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/subvsi3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/subvsi3.c (original)
+++ compiler-rt/trunk/lib/subvsi3.c Wed Mar 31 12:00:45 2010
@@ -26,12 +26,12 @@
if (b >= 0)
{
if (s > a)
- abort();
+ compilerrt_abort();
}
else
{
if (s <= a)
- abort();
+ compilerrt_abort();
}
return s;
}
Modified: compiler-rt/trunk/lib/subvti3.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/subvti3.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/subvti3.c (original)
+++ compiler-rt/trunk/lib/subvti3.c Wed Mar 31 12:00:45 2010
@@ -28,12 +28,12 @@
if (b >= 0)
{
if (s > a)
- abort();
+ compilerrt_abort();
}
else
{
if (s <= a)
- abort();
+ compilerrt_abort();
}
return s;
}
Modified: compiler-rt/trunk/lib/trampoline_setup.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/trampoline_setup.c?rev=100014&r1=100013&r2=100014&view=diff
==============================================================================
--- compiler-rt/trunk/lib/trampoline_setup.c (original)
+++ compiler-rt/trunk/lib/trampoline_setup.c Wed Mar 31 12:00:45 2010
@@ -28,7 +28,7 @@
/* should never happen, but if compiler did not allocate */
/* enough space on stack for the trampoline, abort */
if ( trampSizeAllocated < 40 )
- abort();
+ compilerrt_abort();
/* create trampoline */
trampOnStack[0] = 0x7c0802a6; /* mflr r0 */
More information about the llvm-commits
mailing list