[Mspsim-commit] SF.net SVN: mspsim: [9] mspsim

[<jo...@us...>]

Revision: 9
          http://mspsim.svn.sourceforge.net/mspsim/?rev=9&view=rev
Author:   joxe
Date:     2007-10-25 04:10:47 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
fixed elf to not printout all debuginfo

Modified Paths:
--------------
    mspsim/Makefile
    mspsim/se/sics/mspsim/util/ELF.java

Modified: mspsim/Makefile
===================================================================
--- mspsim/Makefile	2007-10-25 11:03:36 UTC (rev 8)
+++ mspsim/Makefile	2007-10-25 11:10:47 UTC (rev 9)
@@ -95,10 +95,6 @@
 $(CPUTEST):
 	(cd tests && $(MAKE))
 
-test:
-	cd tests && make
-	java se.sics.mspsim.util.Test $(CPUTEST)
-
 .PHONY: mtest
 mtest:	compile $(CPUTEST)
 	@-$(RM) mini-test_cpu.txt

Modified: mspsim/se/sics/mspsim/util/ELF.java
===================================================================
--- mspsim/se/sics/mspsim/util/ELF.java	2007-10-25 11:03:36 UTC (rev 8)
+++ mspsim/se/sics/mspsim/util/ELF.java	2007-10-25 11:10:47 UTC (rev 9)
@@ -106,20 +106,22 @@
     shnum = readElf16();
     shstrndx = readElf16();
 
-    System.out.println("-- ELF Header --");
-    System.out.println("type: " + Integer.toString(type, 16));
-    System.out.println("machine: " + Integer.toString(machine, 16));
-    System.out.println("version: " + Integer.toString(version, 16));
-    System.out.println("entry: " + Integer.toString(entry, 16));
-    System.out.println("phoff: " + Integer.toString(phoff, 16));
-    System.out.println("shoff: " + Integer.toString(shoff, 16));
-    System.out.println("flags: " + Integer.toString(flags, 16));
-    System.out.println("ehsize: " + Integer.toString(ehsize, 16));
-    System.out.println("phentsize: " + Integer.toString(phentsize, 16));
-    System.out.println("phentnum: " + Integer.toString(phnum, 16));
-    System.out.println("shentsize: " + Integer.toString(shentsize, 16));
-    System.out.println("shentnum: " + Integer.toString(shnum, 16));
-    System.out.println("shstrndx: " + Integer.toString(shstrndx, 16));
+    if (DEBUG) {
+      System.out.println("-- ELF Header --");
+      System.out.println("type: " + Integer.toString(type, 16));
+      System.out.println("machine: " + Integer.toString(machine, 16));
+      System.out.println("version: " + Integer.toString(version, 16));
+      System.out.println("entry: " + Integer.toString(entry, 16));
+      System.out.println("phoff: " + Integer.toString(phoff, 16));
+      System.out.println("shoff: " + Integer.toString(shoff, 16));
+      System.out.println("flags: " + Integer.toString(flags, 16));
+      System.out.println("ehsize: " + Integer.toString(ehsize, 16));
+      System.out.println("phentsize: " + Integer.toString(phentsize, 16));
+      System.out.println("phentnum: " + Integer.toString(phnum, 16));
+      System.out.println("shentsize: " + Integer.toString(shentsize, 16));
+      System.out.println("shentnum: " + Integer.toString(shnum, 16));
+      System.out.println("shstrndx: " + Integer.toString(shstrndx, 16));
+    }
   }
 
   public ELFSection readSectionHeader() {
@@ -220,7 +222,9 @@
     programs = new ELFProgram[phnum];
     for (int i = 0, n = phnum; i < n; i++) {
       programs[i] = readProgramHeader();
-      System.out.println("-- Program header --\n" + programs[i].toString());
+      if (DEBUG) {
+	System.out.println("-- Program header --\n" + programs[i].toString());
+      }
     }
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.