More updates

Author: hank

GhidraESP8266_2/src/main/java/ghidraesp8266_2/ESP8266Constants.java

@@ -7,5 +7,8 @@ public final class ESP8266Constants {
 	public final static String SECONDARY_KEY = "2";
     public final static int IROM_MAP_START = 0x40200000;
     public final static int IROM_MAP_END = 0x40300000;
-
+    public final static int SEGMENT_USER_CODE_BASE = 0x40100000;
+    public final static int SEGMENT_USER_DATA_BASE = 0x3FFE8000;
+    public final static int SEGMENT_DATA_END = 0x3FFFFFFF;
+    public final static int SEGMENT_CODE_BASE = 0x40100000;
 }

GhidraESP8266_2/src/main/java/ghidraesp8266_2/ESP8266Header.java

@@ -15,11 +15,14 @@ public class ESP8266Header implements StructConverter {
 	private byte segments;
 	private byte flash_mode;
 	private byte flash_size_free;
-	private byte entrypoint;
+	private long entrypoint;
 
 	public ESP8266Header(BinaryReader reader) throws IOException {
 		magic = reader.readNextByte();
 		segments = reader.readNextByte();
+		flash_mode = reader.readNextByte();
+		flash_size_free = reader.readNextByte();
+		entrypoint = reader.readNextInt();
 		if (ESP8266Constants.ESP_MAGIC_BASE != getMagic()) {
 			throw new IOException("not an ESP8266 file.");
 		}
@@ -29,10 +32,10 @@ public ESP8266Header(BinaryReader reader) throws IOException {
 	public DataType toDataType() throws DuplicateNameException, IOException {
 		Structure structure = new StructureDataType("header_item", 0);
 		structure.add(BYTE, 1, "magic", null);
-		structure.add(BYTE, 1, "segments", null);
+		structure.add(BYTE, 1, "segments", "Number of segments");
 		structure.add(BYTE, 1, "flash_mode", null);
 		structure.add(BYTE, 1, "flash_size_free", null);
-		structure.add(BYTE, 1, "entrypoint", null);
+		structure.add(DWORD, 4, "entrypoint", "The entry function");
 		return structure;
 	}
 
@@ -68,15 +71,11 @@ public void setFlashSizeFree(byte flash_size_free) {
 		this.flash_size_free = flash_size_free;
 	}
 
-	public byte getEntrypoint() {
+	public long getEntrypoint() {
 		return entrypoint;
 	}
 
-	public void setEntrypoint(byte entrypoint) {
+	public void setEntrypoint(long entrypoint) {
 		this.entrypoint = entrypoint;
 	}
-
-	
-	
-
 }

GhidraESP8266_2/src/main/java/ghidraesp8266_2/ESP8266Module.java

@@ -9,11 +9,18 @@
 public class ESP8266Module  {
 
 	private ESP8266Header header;
+	private ESP8266Header userheader;
 	private List<ESP8266Section> sections = new ArrayList<ESP8266Section>();
 
 	public ESP8266Module(BinaryReader reader) throws IOException {
 		header = new ESP8266Header(reader);
-		while (reader.getPointerIndex() < reader.length()) {
+		for(int i=0; i < header.getSegmentCount(); ++i) {
+			sections.add(new ESP8266Section(reader));
+		}
+		// Parse user ROM
+		reader.setPointerIndex(0x1000);
+		userheader = new ESP8266Header(reader);
+		for(int i=0; i < userheader.getSegmentCount(); ++i) {
 			sections.add(new ESP8266Section(reader));
 		}
 	}

GhidraESP8266_2/src/main/java/ghidraesp8266_2/ESP8266Section.java

@@ -41,6 +41,16 @@ public byte[] getContent() {
 	}
 
 	public String getName() {
-		return String.format("Section %08x, size %u", offset, size);
+		// Rules based on ranges
+		if(offset == ESP8266Constants.SEGMENT_USER_CODE_BASE)
+			return ".user_code";
+		else if(offset == ESP8266Constants.SEGMENT_USER_DATA_BASE)
+			return ".user_data";
+		else if(offset <= ESP8266Constants.SEGMENT_DATA_END)
+			return ".data";
+		else if(offset > ESP8266Constants.SEGMENT_CODE_BASE)
+			return ".code";
+		else
+			return ".unknown";
 	}
 }

GhidraESP8266_2/src/main/java/ghidraesp8266_2/GhidraESP8266_2Loader.java

@@ -124,10 +124,10 @@ public Data createData(Program program, Listing listing, Address address, DataTy
 			return d;
 		}
 		catch (CodeUnitInsertionException e) {
-			Msg.warn(this, "ELF data markup conflict at " + address);
+			Msg.warn(this, "Data markup conflict at " + address);
 		}
 		catch (DataTypeConflictException e) {
-			Msg.error(this, "ELF data type markup conflict:" + e.getMessage());
+			Msg.error(this, "Data type markup conflict:" + e.getMessage());
 		}
 		return null;
 	}
@@ -140,9 +140,6 @@ protected void load(ByteProvider provider, LoadSpec loadSpec, List<Option> optio
 		monitor.setMessage( "ESP8266 Loader: Start loading" );
 
 		try {
-			Address start = program.getAddressFactory().getDefaultAddressSpace().getAddress( 0x0 );
-			long length = provider.length();
-	
 			InputStream inputStream;
 			inputStream = provider.getInputStream(0);
 			mbu = new MemoryBlockUtil(program, handler);
@@ -160,6 +157,9 @@ protected void load(ByteProvider provider, LoadSpec loadSpec, List<Option> optio
 			for (ESP8266Section section : module.getSections()) {
 				monitor.setMessage("Loaded " + section.getName());
 			}
+			// Create entry point
+			Address entryAddress = program.getAddressFactory().getDefaultAddressSpace().getAddress(module.getHeader().getEntrypoint(), true);
+			program.getSymbolTable().addExternalEntryPoint(entryAddress);
 		} catch (Exception e) {
 			log.appendException( e );
 		}