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

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

Revision: 511
          http://mspsim.svn.sourceforge.net/mspsim/?rev=511&view=rev
Author:   joxe
Date:     2009-04-20 15:44:29 +0000 (Mon, 20 Apr 2009)

Log Message:
-----------
added verification of MAGIC in ELF files

Modified Paths:
--------------
    mspsim/firmware/sky/blink.firmware
    mspsim/se/sics/mspsim/chip/CC2420.java
    mspsim/se/sics/mspsim/util/ELF.java

Added Paths:
-----------
    mspsim/se/sics/mspsim/util/ELFException.java

Modified: mspsim/firmware/sky/blink.firmware
===================================================================
(Binary files differ)

Modified: mspsim/se/sics/mspsim/chip/CC2420.java
===================================================================
--- mspsim/se/sics/mspsim/chip/CC2420.java	2009-04-10 15:57:37 UTC (rev 510)
+++ mspsim/se/sics/mspsim/chip/CC2420.java	2009-04-20 15:44:29 UTC (rev 511)
@@ -246,7 +246,7 @@
   /* RSSI is an externally set value of the RSSI for this CC2420 */
   /* low RSSI => CCA = true in normal mode */
 
-  private int rssi = 0;
+  private int rssi = -100;
   private static int RSSI_OFFSET = -45; /* cc2420 datasheet */
   /* current CCA value */
   private boolean cca = false;

Modified: mspsim/se/sics/mspsim/util/ELF.java
===================================================================
--- mspsim/se/sics/mspsim/util/ELF.java	2009-04-10 15:57:37 UTC (rev 510)
+++ mspsim/se/sics/mspsim/util/ELF.java	2009-04-20 15:44:29 UTC (rev 511)
@@ -42,17 +42,22 @@
 package se.sics.mspsim.util;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 
 public class ELF {
 
-  public static final int EI_NIDENT = 16;
-  public static final int EI_ENCODING = 5;
-
+  private static final int EI_NIDENT = 16;
+  private static final int EI_ENCODING = 5;
+  private static final int[] MAGIC = new int[] {0x7f, 'E', 'L', 'F'};
+  
   public static final boolean DEBUG = false;
-
+  
+  
   boolean encMSB = true;
   int type;
   int machine;
@@ -87,14 +92,44 @@
     pos = 0;
   }
 
-  public void readHeader() {
+  /* check if the file exists and is an ELF file */
+  public static boolean isELF(File file) {
+    InputStream input = null;
+    try {
+      input = new FileInputStream(file);
+      for (int i = 0; i < MAGIC.length; i++) {
+        if (MAGIC[i] != input.read()) {
+          return false;
+        }
+      }
+    } catch(IOException ioe) {
+      // ignore...
+    } finally {
+      if (input != null) {
+        try {
+          input.close();
+        } catch (Exception e) {
+        }
+      }
+    }
+    return true;
+  }
+  
+  private void readHeader() throws ELFException {
+    for (int i = 0; i < MAGIC.length; i++) {
+      if (elfData[i] != (byte) (MAGIC[i] & 0xff)) {
+        throw new ELFException("Not an elf file");
+      }
+    }
+    
     if (elfData[EI_ENCODING] == 2) {
       encMSB = true;
     } else if (elfData[EI_ENCODING] == 1) {
       encMSB = false;
     } else {
-      System.out.println("ERROR: Wroing encoding???");
+      throw new ELFException("Illegal encoding: " + elfData[EI_ENCODING]);
     }
+    
     pos += 16;
     type = readElf16();
     machine = readElf16();
@@ -128,7 +163,7 @@
     }
   }
 
-  public ELFSection readSectionHeader() {
+  private ELFSection readSectionHeader() {
     ELFSection sec = new ELFSection();
     sec.name = readElf32();
     sec.type = readElf32();
@@ -144,7 +179,7 @@
     return sec;
   }
 
-  public ELFProgram readProgramHeader() {
+  private ELFProgram readProgramHeader() {
     ELFProgram pHeader = new ELFProgram();
     pHeader.type = readElf32();
     pHeader.offset = readElf32();
@@ -243,7 +278,7 @@
     }
   }
 
-  public void readAll() {
+  public void readAll() throws ELFException {
     readHeader();
     readPrograms();
     readSections();

Added: mspsim/se/sics/mspsim/util/ELFException.java
===================================================================
--- mspsim/se/sics/mspsim/util/ELFException.java	                        (rev 0)
+++ mspsim/se/sics/mspsim/util/ELFException.java	2009-04-20 15:44:29 UTC (rev 511)
@@ -0,0 +1,9 @@
+package se.sics.mspsim.util;
+
+import java.io.IOException;
+
+public class ELFException extends IOException {
+  ELFException(String message) {
+    super(message);
+  }
+}


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