X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fdis%2Fdis-cil.c;h=bc40414ba48f77883ff9131dc48957191e247403;hb=ce166860ea51867004930efea92cb7c86178900f;hp=52af86c5b5d4a3e8801caea8bd749d647ab3ccd0;hpb=0bd4004c832f6c5a02c35cada2b6fdbedd1563a2;p=mono.git

diff --git a/mono/dis/dis-cil.c b/mono/dis/dis-cil.c
old mode 100644
new mode 100755
index 52af86c5b5d..bc40414ba48
--- a/mono/dis/dis-cil.c
+++ b/mono/dis/dis-cil.c
@@ -17,35 +17,11 @@
 #include "get.h"
 #include "dump.h"
 #include "dis-cil.h"
+#include "util.h"
 #include "mono/metadata/opcodes.h"
 #include "mono/metadata/class-internals.h"
 #include "mono/utils/mono-compiler.h"
 
-#ifndef HAVE_ISINF
-
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-int isinf (double);
-int
-isinf (double num)
-{
-	fpclass_t klass;
-
-	klass = fpclass (num);
-	if (klass == FP_NINF)
-		return -1;
-
-	if (klass == FP_PINF)
-		return 1;
-
-	return 0;
-}
-#else
-#error "Don't know how to implement isinf for this platform."
-#endif
-
-#endif
-
 #define CODE_INDENT g_assert (indent_level < 512); \
 	indent[indent_level*2] = ' ';	\
 	indent[indent_level*2+1] = ' ';	\
@@ -80,7 +56,7 @@ disassemble_cil (MonoImage *m, MonoMethodHeader *mh, MonoGenericContainer *conta
 #endif
 
        if (mh->num_clauses) {
-	       trys = g_malloc0 (sizeof (gboolean) * mh->num_clauses);
+	       trys = (gboolean *)g_malloc0 (sizeof (gboolean) * mh->num_clauses);
 	       trys [0] = 1;
 	       for (i=1; i < mh->num_clauses; ++i) {
 #define jcl mh->clauses [j]	
@@ -191,12 +167,12 @@ disassemble_cil (MonoImage *m, MonoMethodHeader *mh, MonoGenericContainer *conta
 			double r;
 			int inf;
 			readr8 (ptr, &r);
-			inf = isinf (r);
+			inf = dis_isinf (r);
 			if (inf == -1) 
 				fprintf (output, "(00 00 00 00 00 00 f0 ff)"); /* negative infinity */
 			else if (inf == 1)
 				fprintf (output, "(00 00 00 00 00 00 f0 7f)"); /* positive infinity */
-			else if (isnan (r))
+			else if (dis_isnan (r))
 				fprintf (output, "(00 00 00 00 00 00 f8 ff)"); /* NaN */
 			else {
 				char *str = stringify_double (r);
@@ -300,12 +276,12 @@ disassemble_cil (MonoImage *m, MonoMethodHeader *mh, MonoGenericContainer *conta
 			
 			readr4 (ptr, &f);
 
-			inf = isinf (f);
+			inf = dis_isinf (f);
 			if (inf == -1) 
 				fprintf (output, "(00 00 80 ff)"); /* negative infinity */
 			else if (inf == 1)
 				fprintf (output, "(00 00 80 7f)"); /* positive infinity */
-			else if (isnan (f))
+			else if (dis_isnan (f))
 				fprintf (output, "(00 00 c0 ff)"); /* NaN */
 			else {
 				char *str = stringify_double ((double) f);