From: Boris Boesler Date: Mon, 20 Jan 2003 16:11:59 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=d743c7ac94ab7d3f964b075ea2bb9f6c25ec4d52;p=libfirm *** empty log message *** [r635] --- diff --git a/MakeRules.in b/MakeRules.in index ec7337ea9..6684999ca 100644 --- a/MakeRules.in +++ b/MakeRules.in @@ -17,6 +17,8 @@ exec_prefix?=@exec_prefix@ includedir?=@includedir@ libdir?=@libdir@ INSTALL = @INSTALL@ +INCLUDEDIR ?= ${includedir}/${PACKAGE_NAME} +LIBDIR ?= ${libdir} PACKAGE_NAME = @PACKAGE_NAME@ INCLUDEDIR ?= ${includedir}/${PACKAGE_NAME} LIBDIR ?= ${libdir} diff --git a/configure b/configure index 85c8f7ee4..b5f737a6d 100755 --- a/configure +++ b/configure @@ -3230,9 +3230,9 @@ fi #AC_CHECK_HEADERS(obstack.h, ac_obstack_headers="yes", ac_obstack_headers="no") #if test "$ac_obstack_headers" != yes; then -if test "x$HAVE_OBSTACK" = x; then - { { echo "$as_me:$LINENO: error: \"obstack header file not found\"" >&5 -echo "$as_me: error: \"obstack header file not found\"" >&2;} +if test "x$HAVE_OBSTACK" = 0; then + { { echo "$as_me:$LINENO: error: \"no obstack support\"" >&5 +echo "$as_me: error: \"no obstack support\"" >&2;} { (exit 1); exit 1; }; } fi diff --git a/configure.in b/configure.in index 9a7c2b7b4..93a346a15 100644 --- a/configure.in +++ b/configure.in @@ -191,7 +191,7 @@ AC_FUNC_OBSTACK #AC_CHECK_HEADERS(obstack.h, ac_obstack_headers="yes", ac_obstack_headers="no") #if test "$ac_obstack_headers" != yes; then -if test "x$HAVE_OBSTACK" = x; then +if test "x$HAVE_OBSTACK" = 0; then dnl obstack header not found. AC_MSG_ERROR("no obstack support") fi diff --git a/ir/ident/ident.c b/ir/ident/ident.c index 01aa98f6a..cb3b0825a 100644 --- a/ir/ident/ident.c +++ b/ir/ident/ident.c @@ -164,8 +164,10 @@ int id_is_suffix (ident *suffix, ident *id) { int print_id (ident *id) { xprintf("%I", id); + return(0); } int fprint_id (FILE *F, ident *id) { xfprintf(F, "%I", id); + return(0); } diff --git a/ir/ir/irgraph.h b/ir/ir/irgraph.h index 66d6ae2ec..54c9c179f 100644 --- a/ir/ir/irgraph.h +++ b/ir/ir/irgraph.h @@ -218,9 +218,9 @@ tpedef enum { @@@ make unrecognizable for jni script!!! } irg_loopinfo_state; irg_loopinfo_state get_irg_loopinfo_state(ir_graph *irg); void set_irg_loopinfo_inconsistent(ir_graph *irg); +*/ - - A void * field to link arbritary information to the node. */ +/* A void * field to link arbritary information to the node. */ void set_irg_link (ir_graph *irg, void *thing); void *get_irg_link (ir_graph *irg); diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c index 876b769f2..105232bd4 100644 --- a/ir/ir/irgwalk.c +++ b/ir/ir/irgwalk.c @@ -20,6 +20,7 @@ # include "irgraph.h" /* visited flag */ # include "irprog.h" # include "irgwalk.h" +# include "typewalk.h" # include "eset.h" # include "array.h" diff --git a/ir/ir/irmode.c b/ir/ir/irmode.c index bef5bd332..f16d7a869 100644 --- a/ir/ir/irmode.c +++ b/ir/ir/irmode.c @@ -265,6 +265,7 @@ init_mode (void) modecode get_mode_modecode (ir_mode *mode) { + assert(mode && "no mode given"); return mode->code; } @@ -279,6 +280,7 @@ set_mode_modecode (ir_mode *mode, modecode code) ident * get_mode_ident (ir_mode *mode) { + assert(mode && "no mode given"); return mode->name; } @@ -300,6 +302,7 @@ get_mode_name (ir_mode *mode) { int get_mode_size (ir_mode *mode) { + assert(mode && "no mode given"); return mode->size; } /* @@ -313,6 +316,7 @@ set_mode_size (ir_mode *mode, int size) int get_mode_ld_align (ir_mode *mode) { + assert(mode && "no mode given"); return mode->ld_align; } @@ -327,6 +331,7 @@ set_mode_ld_align (ir_mode *mode, int ld_align) tarval * get_mode_min (ir_mode *mode) { + assert(mode && "no mode given"); return mode->min; } @@ -341,6 +346,7 @@ mode->min = min; tarval * get_mode_max (ir_mode *mode) { + assert(mode && "no mode given"); return mode->max; } @@ -355,6 +361,7 @@ set_mode_max (ir_mode *mode, tarval *max) tarval * get_mode_null (ir_mode *mode) { + assert(mode && "no mode given"); return mode->null; } @@ -369,6 +376,7 @@ set_mode_null (ir_mode *mode, tarval *null) unsigned get_mode_fsigned (ir_mode *mode) { + assert(mode && "no mode given"); return mode->fsigned; } @@ -383,6 +391,7 @@ set_mode_fsigned (ir_mode *mode, unsigned fsigned) unsigned get_mode_ffloat (ir_mode *mode) { + assert(mode && "no mode given"); return mode->ffloat; } @@ -434,47 +443,53 @@ set_mode_ffloat (ir_mode *mode, unsigned ffloat) int mode_is_signed (ir_mode *mode) { - int res; - unsigned fsigned; - fsigned = get_mode_fsigned (mode); - if (fsigned == 1) { - res = 1; - } - else { - res = 0; - } - return res; + int res; + unsigned fsigned; + + assert(mode && "no mode given"); + fsigned = get_mode_fsigned (mode); + if (fsigned == 1) { + res = 1; + } + else { + res = 0; + } + return res; } INLINE int mode_is_float (ir_mode *mode) { - int res; - unsigned ffloat; - ffloat = get_mode_ffloat (mode); - if (ffloat == 1) { - res = 1; - } - else { - res = 0; - } - return res; + int res; + unsigned ffloat; + + assert(mode && "no mode given"); + ffloat = get_mode_ffloat (mode); + if (ffloat == 1) { + res = 1; + } + else { + res = 0; + } + return res; } INLINE int mode_is_int (ir_mode *mode) { - int res; - modecode code; - code = get_mode_modecode (mode); - if ((code >= irm_Bs) && (code <= irm_Lu)) { - res = 1; - } - else { - res = 0; - } - return res; + int res; + modecode code; + + assert(mode && "no mode given"); + code = get_mode_modecode (mode); + if ((code >= irm_Bs) && (code <= irm_Lu)) { + res = 1; + } + else { + res = 0; + } + return res; } @@ -482,6 +497,8 @@ INLINE int mode_is_num (ir_mode *mode) { int res; + + assert(mode && "no mode given"); if (mode_is_int (mode) || mode_is_float (mode)) { res = 1; } @@ -496,6 +513,8 @@ mode_is_data (ir_mode *mode) { int res; modecode code; + + assert(mode && "no mode given"); code = get_mode_modecode (mode); if (mode_is_num (mode) || code == irm_C || code == irm_U || code == irm_P) { @@ -512,6 +531,8 @@ mode_is_datab (ir_mode *mode) { int res; modecode code; + + assert(mode && "no mode given"); code = get_mode_modecode (mode); if (mode_is_data (mode) || code == irm_b ) { res = 1; @@ -527,6 +548,8 @@ mode_is_dataM (ir_mode *mode) { int res; modecode code; + + assert(mode && "no mode given"); code = get_mode_modecode (mode); if (mode_is_data (mode) || code == irm_M) { res = 1; diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c index 5c601c598..932ed9131 100644 --- a/ir/ir/irnode.c +++ b/ir/ir/irnode.c @@ -342,6 +342,8 @@ INLINE opcode get_irn_opcode (ir_node *node) { assert (node); + assert (k_ir_node == get_kind(node)); + assert (node -> op); return node->op->code; } diff --git a/ir/ir/irnode.h b/ir/ir/irnode.h index cf9b0a49b..75c59dfc9 100644 --- a/ir/ir/irnode.h +++ b/ir/ir/irnode.h @@ -395,7 +395,7 @@ typedef enum { Uge, /* unordered, greater or equal */ Ne, /* unordered, less or greater = not equal */ True /* true */ - /* not_mask = Leg /* bits to flip to negate comparison * @@ hack for jni interface */ + /* not_mask = Leg*/ /* bits to flip to negate comparison * @@ hack for jni interface */ } pnc_number; #define not_mask Leg INLINE char *get_pnc_string(int pnc);