deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

changed address parsing using nm to more generic: any command may be used

Browse source
This commit is contained in:
fros4943 2007-09-18 11:33:46 +00:00
parent aa99049af0
commit 8f101f495c
10 changed files with 131 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tools/cooja/examples/jni_test/level3b/Level3b.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: Level3b.java,v 1.1 2007/09/10 14:06:23 fros4943 Exp $
* $Id: Level3b.java,v 1.2 2007/09/18 11:35:10 fros4943 Exp $
*/
import java.io.*;
@ -49,9 +49,8 @@ public class Level3b {
GUI.loadExternalToolsDefaultSettings();
GUI.loadExternalToolsUserSettings();
System.out.println("Using nm settings: \n" +
"\tPATH_NM = "+ GUI.getExternalToolsSetting("PATH_NM") +
"\tNM_ARGS = "+ GUI.getExternalToolsSetting("NM_ARGS"));
System.out.println("Using parse command settings: \n" +
"\tPARSE_COMMAND = "+ GUI.getExternalToolsSetting("PARSE_COMMAND"));
System.out.println("Locating library file");
File libFile = new File("level3b.library");
@ -60,24 +59,24 @@ public class Level3b {
System.exit(1);
}
System.out.println("Loading nm data");
Vector<String> nmData = ContikiMoteType.loadNmData(libFile);
if (nmData == null) {
System.err.println("No nm data could be loaded");
System.out.println("Loading command data");
Vector<String> commandData = ContikiMoteType.loadCommandData(libFile);
if (commandData == null) {
System.err.println("No command data could be loaded");
System.exit(1);
}
System.out.println("Parsing nm data");
System.out.println("Parsing command data");
Properties addresses = new Properties();
boolean parseOK = ContikiMoteType.parseNmData(nmData, addresses);
boolean parseOK = ContikiMoteType.parseCommandData(commandData, addresses);
if (!parseOK) {
System.err.println("Nm data parsing failed");
System.err.println("Command data parsing failed");
System.exit(1);
}
int relDataSectionAddr = ContikiMoteType.loadNmRelDataSectionAddr(nmData);
int dataSectionSize = ContikiMoteType.loadNmDataSectionSize(nmData);
int relBssSectionAddr = ContikiMoteType.loadNmRelBssSectionAddr(nmData);
int bssSectionSize = ContikiMoteType.loadNmBssSectionSize(nmData);
int relDataSectionAddr = ContikiMoteType.loadCommandRelDataSectionAddr(commandData);
int dataSectionSize = ContikiMoteType.loadCommandDataSectionSize(commandData);
int relBssSectionAddr = ContikiMoteType.loadCommandRelBssSectionAddr(commandData);
int bssSectionSize = ContikiMoteType.loadCommandBssSectionSize(commandData);
System.out.println("Found relative data section address: 0x" + Integer.toHexString(relDataSectionAddr));
System.out.println("Found data section size: 0x" + Integer.toHexString(dataSectionSize));