mspsim-commit Mailing List for mspsim (Page 36)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 36
          http://mspsim.svn.sourceforge.net/mspsim/?rev=36&view=rev
Author:   joxe
Date:     2007-12-06 03:47:45 -0800 (Thu, 06 Dec 2007)

Log Message:
-----------
added some support for debug info - stabs - in ELF files

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

Added Paths:
-----------
    mspsim/se/sics/mspsim/util/DebugInfo.java
    mspsim/se/sics/mspsim/util/ELFDebug.java

Added: mspsim/se/sics/mspsim/util/DebugInfo.java
===================================================================

--- mspsim/se/sics/mspsim/util/DebugInfo.java	                        (rev 0)
+++ mspsim/se/sics/mspsim/util/DebugInfo.java	2007-12-06 11:47:45 UTC (rev 36)
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of MSPSim.
+ *
+ * $Id: ELF.java,v 1.3 2007/10/21 21:17:34 nfi Exp $
+ *
+ * -----------------------------------------------------------------
+ *
+ * ELF
+ *
+ * Author  : Joakim Eriksson
+ * Created : Sun Oct 21 22:00:00 2007
+ * Updated : $Date: 2007/10/21 21:17:34 $
+ *           $Revision: 1.3 $
+ */
+
+package se.sics.mspsim.util;
+import se.sics.mspsim.core.*;
+
+public class DebugInfo {
+
+  private String file;
+  private String path;
+  private int lineNo;
+  private String function;
+
+  public DebugInfo(int line, String path, String file, String fun) {
+    this.lineNo = line;
+    this.file = file;
+    this.path = path;
+    this.function = fun;
+  }
+
+  public String getFile() {
+    return file;
+  }
+
+  public String getPath() {
+    return path;
+  }
+
+  public String getFunction() {
+    return function;
+  }
+
+  public int getLine() {
+    return lineNo;
+  }
+
+} // DebugInfo

Modified: mspsim/se/sics/mspsim/util/ELF.java
===================================================================
--- mspsim/se/sics/mspsim/util/ELF.java	2007-12-01 12:06:29 UTC (rev 35)
+++ mspsim/se/sics/mspsim/util/ELF.java	2007-12-06 11:47:45 UTC (rev 36)
@@ -77,7 +77,11 @@
 
   ELFSection strTable;
   ELFSection symTable;
+  ELFSection dbgStab;
+  ELFSection dbgStabStr;
 
+  ELFDebug debug;
+
   public ELF(byte[] data) {
     elfData = data;
     pos = 0;
@@ -215,6 +219,17 @@
 	strTable = sections[i];
       }
     }
+
+    /* Find sections */
+    for (int i = 0, n = shnum; i < n; i++) {
+      if (".stabstr".equals(sections[i].getSectionName())) {
+	dbgStabStr = sections[i];
+      }
+      if (".stab".equals(sections[i].getSectionName())) {
+	dbgStab = sections[i];
+      }
+    }
+
   }
 
   private void readPrograms() {
@@ -232,6 +247,9 @@
     readHeader();
     readPrograms();
     readSections();
+    if (dbgStab != null) {
+      debug = new ELFDebug(this, dbgStab, dbgStabStr);
+    }
   }
 
   public void loadPrograms(int[] memory) {
@@ -256,6 +274,10 @@
     }
   }
 
+  public DebugInfo getDebugInfo(int adr) {
+    return debug.getDebugInfo(adr);
+  }
+
   public MapTable getMap() {
     MapTable map = new MapTable();
 
@@ -315,22 +337,30 @@
   public static void main(String[] args) throws Exception {
     ELF elf = readELF(args[0]);
 
-    for (int i = 0, n = elf.shnum; i < n; i++) {
-      System.out.println("-- Section header " + i + " --\n" + elf.sections[i]);
-      if (".stab".equals(elf.sections[i].getSectionName()) ||
-	  ".stabstr".equals(elf.sections[i].getSectionName())) {
-	int adr = elf.sections[i].offset;
-	System.out.println(" == Section data ==");
-	for (int j = 0, m = 2000; j < m; j++) {
-	  System.out.print((char) elf.elfData[adr++]);
-	  if (i % 20 == 19) System.out.println("");
+    if (args.length < 2) {
+      for (int i = 0, n = elf.shnum; i < n; i++) {
+	System.out.println("-- Section header " + i + " --\n" + elf.sections[i]);
+	if (".stab".equals(elf.sections[i].getSectionName()) ||
+	    ".stabstr".equals(elf.sections[i].getSectionName())) {
+	  int adr = elf.sections[i].offset;
+	  System.out.println(" == Section data ==");
+	  for (int j = 0, m = 2000; j < m; j++) {
+	    System.out.print((char) elf.elfData[adr++]);
+	    if (i % 20 == 19) System.out.println("");
+	  }
 	}
+	System.out.println("");
       }
-      System.out.println("");
     }
-
     elf.getMap();
-
+    if (args.length > 1) {
+      DebugInfo dbg = elf.getDebugInfo(Integer.parseInt(args[1]));
+      if (dbg != null) {
+	System.out.println("File: " + dbg.getFile());
+	System.out.println("Function: " + dbg.getFunction());
+	System.out.println("LineNo: " + dbg.getLine());
+      }
+    }
   }
 
 

Added: mspsim/se/sics/mspsim/util/ELFDebug.java
===================================================================
--- mspsim/se/sics/mspsim/util/ELFDebug.java	                        (rev 0)
+++ mspsim/se/sics/mspsim/util/ELFDebug.java	2007-12-06 11:47:45 UTC (rev 36)
@@ -0,0 +1,166 @@
+/**
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of MSPSim.
+ *
+ * $Id: ELF.java,v 1.3 2007/10/21 21:17:34 nfi Exp $
+ *
+ * -----------------------------------------------------------------
+ *
+ * ELF
+ *
+ * Author  : Joakim Eriksson
+ * Created : Sun Oct 21 22:00:00 2007
+ * Updated : $Date: 2007/10/21 21:17:34 $
+ *           $Revision: 1.3 $
+ */
+
+package se.sics.mspsim.util;
+import se.sics.mspsim.core.*;
+
+public class ELFDebug {
+
+  private Stab[] stabs;
+
+  public static final int N_FUN = 0x24;
+  public static final int N_SLINE = 0x44;
+  public static final int N_SO = 0x64; // filename and path
+
+  public static final boolean DEBUG = false;
+
+  ELFSection dbgStab;
+  ELFSection dbgStabStr;
+
+  public ELFDebug(ELF elf, ELFSection stab, ELFSection stabstr) {
+    dbgStab = stab;
+    dbgStabStr = stabstr;
+
+    int len = dbgStab.size;
+    int count = len / dbgStab.entSize;
+    int addr = dbgStab.offset;
+
+    if (DEBUG) System.out.println("Number of stabs:" + count);
+    stabs = new Stab[count];
+    for (int i = 0, n = count; i < n; i++) {
+      elf.pos = addr;
+      int nI = elf.readElf32();
+      String stabData = elf.dbgStabStr.getName(nI);
+      int type = elf.readElf8();
+      int other = elf.readElf8();
+      int desc = elf.readElf16();
+      int value = elf.readElf32();
+      stabs[i] = new Stab(stabData, type, other, desc, value);
+
+      if (DEBUG) {
+	System.out.println("Stab: " + Utils.hex8(type) +
+			   " " + stabData + " o:" + other
+			   + " d:" + desc + " v:" + value);
+      }
+      addr += dbgStab.entSize;
+    }
+  }
+
+  /* Just pick up file + some other things */
+  public DebugInfo getDebugInfo(int address) {
+    String currentPath = null;
+    String currentFile = null;
+    String currentFunction = null;
+    int lastAddress = 0;
+    int currentLine = 0;
+    int currentLineAdr = 0;
+    for (int i = 0, n = stabs.length; i < n; i++) {
+      Stab stab = stabs[i];
+      switch(stab.type) {
+      case N_SO:
+	if (stab.value < address) {
+	  if (stab.data != null && stab.data.endsWith("/")) {
+	    currentPath = stab.data;
+	    lastAddress = stab.value;
+	    currentFunction = null;
+	  } else {
+	    currentFile = stab.data;
+	    lastAddress = stab.value;
+	    currentFunction = null;
+	  }
+	} else {
+	  /* requires sorted order of all file entries in stab section */
+	  System.out.println("FILE: Already passed address..." +
+			     currentPath + " " +
+			     currentFile + " " + currentFunction);
+	  return null;
+	}
+	break;
+      case N_SLINE:
+	if (currentPath != null) { /* only files with path... */
+	  if (currentLineAdr < address) {
+	    currentLine = stab.desc;
+	    currentLineAdr = lastAddress + stab.value;
+	    if (currentLineAdr >= address) {
+	      // Finished!!!
+	      if (DEBUG) {
+		System.out.println("File: " + currentPath + " " + currentFile);
+		System.out.println("Function: " + currentFunction);
+		System.out.println("Line No: " + currentLine);
+	      }
+	      return new DebugInfo(currentLine, currentPath, currentFile,
+				   currentFunction);
+	    }
+	  }
+	}
+	break;
+      case N_FUN:
+	if (stab.value < address) {
+	  currentFunction = stab.data;
+	  lastAddress = stab.value;
+	} else {
+	  System.out.println("FUN: Already passed address...");
+	  return null;
+	}
+	break;
+      }
+    }
+    return null;
+  }
+
+  private class Stab {
+
+    String data;
+    int type;
+    int other;
+    int desc;
+    int value;
+
+    Stab(String data, int type, int other, int desc, int value) {
+      this.data = data;
+      this.type = type;
+      this.other = other;
+      this.desc = desc;
+      this.value = value;
+    }
+  }
+
+} // ELFDebug

Modified: mspsim/se/sics/mspsim/util/ELFSection.java
===================================================================
--- mspsim/se/sics/mspsim/util/ELFSection.java	2007-12-01 12:06:29 UTC (rev 35)
+++ mspsim/se/sics/mspsim/util/ELFSection.java	2007-12-06 11:47:45 UTC (rev 36)
@@ -46,15 +46,15 @@
   public static final int TYPE_NULL       =   0;
   public static final int TYPE_PROGBITS   =   1;
   public static final int TYPE_SYMTAB     =   2;
-  public static final int TYPE_STRTAB	 =3;
-  public static final int TYPE_RELA	  =       4;
-  public static final int TYPE_HASH	   =      5;
+  public static final int TYPE_STRTAB	  =   3;
+  public static final int TYPE_RELA	  =   4;
+  public static final int TYPE_HASH	  =   5;
   public static final int TYPE_DYNAMIC    =   6;
-  public static final int TYPE_NOTE	     =    7;
-  public static final int TYPE_NOBITS	= 8;
-  public static final int TYPE_REL	 =        9;
-  public static final int TYPE_SHLIB    =     10;
-  public static final int TYPE_DYNSYM    =    11;
+  public static final int TYPE_NOTE	  =   7;
+  public static final int TYPE_NOBITS	  =   8;
+  public static final int TYPE_REL	  =   9;
+  public static final int TYPE_SHLIB      =  10;
+  public static final int TYPE_DYNSYM     =  11;
 
   public static final int SYMBIND_LOCAL = 0;
   public static final int SYMBIND_GLOBAL = 1;


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




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (21)	Nov (12)	Dec (41)
2008	Jan (25)	Feb (54)	Mar (63)	Apr (52)	May (17)	Jun (3)	Jul (3)	Aug (5)	Sep (49)	Oct (50)	Nov (34)	Dec (14)
2009	Jan (9)	Feb (15)	Mar (38)	Apr (12)	May (35)	Jun (20)	Jul (2)	Aug (7)	Sep (36)	Oct (24)	Nov (2)	Dec (2)
2010	Jan (14)	Feb (1)	Mar (36)	Apr (2)	May (4)	Jun (6)	Jul (35)	Aug (11)	Sep (8)	Oct (3)	Nov	Dec (1)
2011	Jan (11)	Feb (12)	Mar (3)	Apr (7)	May (12)	Jun (8)	Jul	Aug (3)	Sep (4)	Oct	Nov (2)	Dec (4)
2012	Jan (2)	Feb (1)	Mar (14)	Apr (5)	May (28)	Jun	Jul	Aug	Sep	Oct (21)	Nov (4)	Dec (1)
2013	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

mspsim-commit Mailing List for mspsim (Page 36)

Java-based instruction level emulator of MSP430. Code on github.

mspsim-commit — Commit messages