diff --git a/bundles/org.vcml.explorer.ui/src/org/vcml/explorer/ui/Instruction.java b/bundles/org.vcml.explorer.ui/src/org/vcml/explorer/ui/Instruction.java index 9a032ee..c36c88d 100644 --- a/bundles/org.vcml.explorer.ui/src/org/vcml/explorer/ui/Instruction.java +++ b/bundles/org.vcml.explorer.ui/src/org/vcml/explorer/ui/Instruction.java @@ -132,7 +132,7 @@ public Instruction(long address, String description) { String insn = matcher.group(4); String disas = matcher.group(5); - if (phys == null || phys == "") + if (phys == null || phys.isEmpty() || phys == "") phys = virt; symbol = (sym != null) ? sym : ""; diff --git a/bundles/org.vcml.explorer.ui/src/org/vcml/explorer/ui/services/InspectionService.java b/bundles/org.vcml.explorer.ui/src/org/vcml/explorer/ui/services/InspectionService.java index 54b8c24..1545608 100644 --- a/bundles/org.vcml.explorer.ui/src/org/vcml/explorer/ui/services/InspectionService.java +++ b/bundles/org.vcml.explorer.ui/src/org/vcml/explorer/ui/services/InspectionService.java @@ -52,6 +52,8 @@ public InspectionService() { // find a better way to do this registerModulePart(Module.KIND_VCML_TERMINAL, "org.vcml.explorer.ui.parts.UartPart"); registerModulePart(Module.KIND_VCML_PROCESSOR, "org.vcml.explorer.ui.parts.ProcessorPart"); registerModulePart(Module.KIND_SIMV_HART, "org.vcml.explorer.ui.parts.ProcessorPart"); + registerModulePart(Module.KIND_SIMA_CORE, "org.vcml.explorer.ui.parts.ProcessorPart"); + registerModulePart(Module.KIND_USIMA_CORE, "org.vcml.explorer.ui.parts.ProcessorPart"); } } diff --git a/bundles/org.vcml.session/src/org/vcml/session/Module.java b/bundles/org.vcml.session/src/org/vcml/session/Module.java index 0b02031..bd2c71c 100644 --- a/bundles/org.vcml.session/src/org/vcml/session/Module.java +++ b/bundles/org.vcml.session/src/org/vcml/session/Module.java @@ -54,6 +54,8 @@ public class Module { public static final String KIND_VCML_TERMINAL = "vcml::serial::terminal"; public static final String KIND_SIMV_HART = "simv::hart"; + public static final String KIND_SIMA_CORE = "sima::core"; + public static final String KIND_USIMA_CORE = "usima::core"; public static final String VERSION_UNKNOWN = "unknown";