[llvm-commits] CVS: llvm-test/MultiSource/Applications/d/d.h symtab.c util.c write_ctables.c

[Evan Cheng]

Changes in directory llvm-test/MultiSource/Applications/d:

d.h updated: 1.1 -> 1.2
symtab.c updated: 1.1 -> 1.2
util.c updated: 1.1 -> 1.2
write_ctables.c updated: 1.2 -> 1.3
---
Log message:

Fix some non-64-bit-clean code that causes mismatch between gcc / llvm.

---
Diffs of the changes:  (+4 -3)

 d.h             |    1 +
 symtab.c        |    2 +-
 util.c          |    2 +-
 write_ctables.c |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)


Index: llvm-test/MultiSource/Applications/d/d.h
diff -u llvm-test/MultiSource/Applications/d/d.h:1.1 llvm-test/MultiSource/Applications/d/d.h:1.2
--- llvm-test/MultiSource/Applications/d/d.h:1.1	Thu Jan  1 10:50:35 2004
+++ llvm-test/MultiSource/Applications/d/d.h	Wed Jul 12 16:05:09 2006
@@ -77,6 +77,7 @@
 typedef short int16;
 typedef unsigned short uint16;
 /* typedef uint32 uint; * already part of most systems */
+typedef unsigned long ulong;
 
 #include "dparse.h"
 #include "arg.h"


Index: llvm-test/MultiSource/Applications/d/symtab.c
diff -u llvm-test/MultiSource/Applications/d/symtab.c:1.1 llvm-test/MultiSource/Applications/d/symtab.c:1.2
--- llvm-test/MultiSource/Applications/d/symtab.c:1.1	Thu Jan  1 10:50:36 2004
+++ llvm-test/MultiSource/Applications/d/symtab.c	Wed Jul 12 16:05:09 2006
@@ -303,7 +303,7 @@
 
 void
 print_scope(D_Scope *st) {
-  printf("SCOPE %X: ", (int)st);
+  printf("SCOPE %X: ", (long)st);
   printf("  owned: %d, kind: %d, ", st->owned_by_user, st->kind);
   if (st->ll) printf("  LL\n");
   if (st->hash) printf("  HASH\n");


Index: llvm-test/MultiSource/Applications/d/util.c
diff -u llvm-test/MultiSource/Applications/d/util.c:1.1 llvm-test/MultiSource/Applications/d/util.c:1.2
--- llvm-test/MultiSource/Applications/d/util.c:1.1	Thu Jan  1 10:50:36 2004
+++ llvm-test/MultiSource/Applications/d/util.c	Wed Jul 12 16:05:09 2006
@@ -148,7 +148,7 @@
   int j, n = v->n;
   uint i;
   if (n) {
-    uint h = ((uint)t);
+    ulong h = ((ulong)t);
     h = h % n;
     for (i = h, j = 0; 
 	 i < v->n && j < SET_MAX_SEQUENTIAL; 


Index: llvm-test/MultiSource/Applications/d/write_ctables.c
diff -u llvm-test/MultiSource/Applications/d/write_ctables.c:1.2 llvm-test/MultiSource/Applications/d/write_ctables.c:1.3
--- llvm-test/MultiSource/Applications/d/write_ctables.c:1.2	Fri Oct 21 01:38:55 2005
+++ llvm-test/MultiSource/Applications/d/write_ctables.c	Wed Jul 12 16:05:09 2006
@@ -385,7 +385,7 @@
 
 static void
 write_goto_data_as_C(FILE *fp, Grammar *g, char *tag) {
-  Vec(int) vgoto;
+  Vec(long) vgoto;
   State *s;
   uint8 *goto_valid = NULL;
   int i, j, x, again, lowest, nvalid_bytes, sym, lowest_sym;