NASM 0.98nasm-0.98fork-0.98bf

1 files changed, 179 insertions, 54 deletions

diff --git a/rdoff/rdfdump.c b/rdoff/rdfdump.c
index 080c2e73..cb79a64d 100644
--- a/rdoff/rdfdump.c
+++ b/rdoff/rdfdump.c
@@ -4,6 +4,8 @@
 
 FILE *infile;
 
+typedef unsigned short int16;
+
 long translatelong(long in) {		/* translate from little endian to
 					   local representation */
   long r;
@@ -18,7 +20,7 @@ long translatelong(long in) {		/* translate from little endian to
   return r;
 }
   
-int translateshort(short in) {
+int translateshort(int16 in) {
   int r;
   unsigned char *i;
 
@@ -27,70 +29,136 @@ int translateshort(short in) {
 
   return r;
 }
-void print_header(long length) {
+
+void print_header(long length, int rdf_version) {
   char buf[129],t,s,l;
+  unsigned char reclen;
   long o,ll;
-  short rs;
+  int16 rs;
 
   while (length > 0) {
     fread(&t,1,1,infile);
+    if (rdf_version >= 2) {
+	fread(&reclen,1,1,infile);
+    }
     switch(t) {
     case 1:		/* relocation record */
+    case 6:		/* segment relocation */
       fread(&s,1,1,infile);
       fread(&o,4,1,infile);
       fread(&l,1,1,infile);
       fread(&rs,2,1,infile); 
-      printf("  relocation: location (%04x:%08lx), length %d, "
-	     "referred seg %04x\n",(int)s,translatelong(o),(int)l,
+      printf("  %s: location (%04x:%08lx), length %d, "
+	     "referred seg %04x\n", t == 1 ? "relocation" : "seg relocation",
+	     (int)s,translatelong(o),(int)l,
 	     translateshort(rs));
-      length -= 9;
+      if (rdf_version >= 2 && reclen != 8)
+	  printf("    warning: reclen != 8\n");
+      if (rdf_version == 1) length -= 9;
+      if (rdf_version == 1 && t == 6)
+	  printf("    warning: seg relocation not supported in RDOFF1\n");
       break;
     case 2:             /* import record */
+    case 7:		/* import far symbol */
       fread(&rs,2,1,infile);
       ll = 0;
-      do {
-	fread(&buf[ll],1,1,infile);
-      } while (buf[ll++]);
-      printf("  import: segment %04x = %s\n",translateshort(rs),buf);
-      length -= ll + 3;
+
+      if (rdf_version == 1) {
+	  do {
+	      fread(&buf[ll],1,1,infile);
+	  } while (buf[ll++]);
+      }
+      else
+      {
+	  for (;ll < reclen - 2; ll++)
+	      fread(&buf[ll],1,1,infile);
+      }
+
+      printf("  %simport: segment %04x = %s\n",t == 7 ? "far " : "",
+	     translateshort(rs),buf);
+      if (rdf_version == 1) length -= ll + 3;
+      if (rdf_version == 1 && t == 7)
+	  printf ("    warning: far import not supported in RDOFF1\n");
       break;
     case 3:             /* export record */
       fread(&s,1,1,infile);
       fread(&o,4,1,infile);
       ll = 0;
-      do {
-	fread(&buf[ll],1,1,infile);
-      } while (buf[ll++]);
+
+      if (rdf_version == 1) {
+	  do {
+	      fread(&buf[ll],1,1,infile);
+	  } while (buf[ll++]);
+      }
+      else
+      {
+	  for (; ll < reclen - 5; ll ++)
+	      fread(&buf[ll],1,1,infile);
+      }
       printf("  export: (%04x:%08lx) = %s\n",(int)s,translatelong(o),buf);
-      length -= ll + 6;
+      if (rdf_version == 1) length -= ll + 6;
       break;
     case 4:		/* DLL record */
       ll = 0;
-      do {
-	fread(&buf[ll],1,1,infile);
-      } while (buf[ll++]);
+
+      if (rdf_version == 1) {
+	  do {
+	      fread(&buf[ll],1,1,infile);
+	  } while (buf[ll++]);
+      }
+      else
+      {
+	  for (; ll < reclen - 1; ll++)
+	      fread(&buf[ll],1,1,infile);
+      }
       printf("  dll: %s\n",buf);
-      length -= ll + 1;
+      if (rdf_version == 1) length -= ll + 1;
       break;
     case 5:		/* BSS reservation */
       fread(&ll,4,1,infile);
       printf("  bss reservation: %08lx bytes\n",translatelong(ll));
-      length -= 5;
+      if (rdf_version == 1) length -= 5;
+      if (rdf_version > 1 && reclen != 4)
+	  printf("    warning: reclen != 4\n");
       break;
     default:
-      printf("  unrecognised record (type %d)\n",(int)t);
-      length --;
+      printf("  unrecognised record (type %d",(int)t);
+      if (rdf_version > 1) printf(", length %d",(int)reclen);
+      printf(")\n");
+      if (rdf_version == 1) length --;
     }
+    if (rdf_version != 1) length -= 2 + reclen;
   }
 }
 
+char * knowntypes[8] = {"NULL", "text", "data", "object comment",
+			"linked comment", "loader comment",
+			"symbolic debug", "line number debug"};
+
+char * translatesegmenttype(int16 type) {
+    if (type < 8) return knowntypes[type];
+    if (type < 0x0020) return "reserved";
+    if (type < 0x1000) return "reserved - moscow";
+    if (type < 0x8000) return "reserved - system dependant";
+    if (type < 0xFFFF) return "reserved - other";
+    if (type == 0xFFFF) return "invalid type code";
+    return "type code out of range";
+}    
+
 int main(int argc,char **argv) {
   char id[7];
   long l;
+  int16 s;
   int verbose = 0;
   long offset;
+  int  foundnullsegment = 0;
+  int  version;
+  long segmentcontentlength = 0;
+  int  nsegments = 0;
+  long headerlength = 0;
+  long objectlength = 0;
 
-  puts("RDOFF Dump utility v1.1 (C) Copyright 1996 Julian R Hall");
+  puts("RDOFF Dump utility v2.0 (C) Copyright 1996 Julian R Hall");
 
   if (argc < 2) {
     fputs("Usage: rdfdump [-v] <filename>\n",stderr);
@@ -121,46 +189,103 @@ int main(int argc,char **argv) {
   }
 
   printf("File %s: RDOFF version %c\n\n",argv[1],id[5]);
-  if (id[5] < '1' || id[5] > '1') {
+  if (id[5] < '1' || id[5] > '2') {
     fprintf(stderr,"rdfdump: unknown RDOFF version '%c'\n",id[5]);
     exit(1);
   }
+  version = id[5] - '0';
 
-  fread(&l,4,1,infile);
-  l = translatelong(l);
-  printf("Header (%ld bytes):\n",l);
-  print_header(l);
-
-  fread(&l,4,1,infile);
-  l = translatelong(l);
-  printf("\nText segment length = %ld bytes\n",l);
-  offset = 0;
-  while(l--) {
-    fread(id,1,1,infile);
-    if (verbose) {
-      if (offset % 16 == 0)
-	printf("\n%08lx ", offset);
-      printf(" %02x",(int) (unsigned char)id[0]);
-      offset++;
-    }
+  if (version > 1) {
+      fread(&l, 4, 1, infile);
+      objectlength = translatelong(l);
+      printf("Object content size: %ld bytes\n", objectlength);
   }
-  if (verbose) printf("\n\n");
 
   fread(&l,4,1,infile);
-  l = translatelong(l);
-  printf("Data segment length = %ld bytes\n",l);
+  headerlength = translatelong(l);
+  printf("Header (%ld bytes):\n",headerlength);
+  print_header(headerlength, version);
+
+  if (version == 1) {
+      fread(&l,4,1,infile);
+      l = translatelong(l);
+      printf("\nText segment length = %ld bytes\n",l);
+      offset = 0;
+      while(l--) {
+	  fread(id,1,1,infile);
+	  if (verbose) {
+	      if (offset % 16 == 0)
+		  printf("\n%08lx ", offset);
+	      printf(" %02x",(int) (unsigned char)id[0]);
+	      offset++;
+	  }
+      }
+      if (verbose) printf("\n\n");
+      
+      fread(&l,4,1,infile);
+      l = translatelong(l);
+      printf("Data segment length = %ld bytes\n",l);
 
-  if (verbose)
+      if (verbose)
+      {
+	  offset = 0;
+	  while (l--) {
+	      fread(id,1,1,infile);
+	      if (offset % 16 == 0)
+		  printf("\n%08lx ", offset);
+	      printf(" %02x",(int) (unsigned char) id[0]);
+	      offset++;
+	  }
+	  printf("\n");
+      }
+  }
+  else
   {
-    offset = 0;
-    while (l--) {
-      fread(id,1,1,infile);
-      if (offset % 16 == 0)
-	printf("\n%08lx ", offset);
-      printf(" %02x",(int) (unsigned char) id[0]);
-      offset++;
-    }
-    printf("\n");
+      do {
+	  fread(&s,2,1,infile);
+	  s = translateshort(s);
+	  if (!s) {
+	      printf("\nNULL segment\n");
+	      foundnullsegment = 1;
+	      break;
+	  }
+	  printf("\nSegment:\n  Type   = %04X (%s)\n",(int)s,
+		 translatesegmenttype(s));
+	  nsegments++;
+
+	  fread(&s,2,1,infile);
+	  printf("  Number = %04X\n",(int)translateshort(s));
+	  fread(&s,2,1,infile);
+	  printf("  Resrvd = %04X\n",(int)translateshort(s));
+	  fread(&l,4,1,infile);
+	  l = translatelong(l);
+	  printf("  Length = %ld bytes\n",l);
+	  segmentcontentlength += l;
+
+	  offset = 0;
+	  while(l--) {
+	      fread(id,1,1,infile);
+	      if (verbose) {
+		  if (offset % 16 == 0)
+		      printf("\n%08lx ", offset);
+		  printf(" %02x",(int) (unsigned char)id[0]);
+		  offset++;
+	      }
+	  }
+	  if (verbose) printf("\n");
+      } while (!feof(infile));
+      if (! foundnullsegment)
+	  printf("\nWarning: unexpected end of file - "
+		 "NULL segment not found\n");
+
+      printf("\nTotal number of segments: %d\n", nsegments);
+      printf("Total segment content length: %ld bytes\n",segmentcontentlength);
+
+      /* calculate what the total object content length should have been */
+      l = segmentcontentlength + 10 * (nsegments+1) + headerlength + 4;
+      if (l != objectlength)
+	  printf("Warning: actual object length (%ld) != "
+		 "stored object length (%ld)\n", l, objectlength);
   }
   fclose(infile);
   return 0;