Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge with yath #2

Closed
wants to merge 1 commit into from
Closed

Fix merge with yath #2

wants to merge 1 commit into from

Conversation

IridiumXOR
Copy link

During last merge there is an implicit conflict of registers (due to the insertion of iX and oX ones and changes in cspec file from yath)

During last merge there is an implicit conflict of registers (due to the insertion of iX and oX ones and changes in cspec file from yath)
@bvernoux
Copy link

bvernoux commented Dec 15, 2022

I confirm your fix seems to work fine (with latest Ghidra 10.2.2) but I suspect the merge is not what it should be and it is hard to know which code is the correct one and to check the effect of that file...
As it seems the correct fix is to remove the following entries to be confirmed by @Ebiroll

        </pentry>
        <pentry minsize="5" maxsize="8" extension="inttype">
          <addr space="join" piece1="o3" piece2="o2"/>
        </pentry>
        <pentry minsize="9" maxsize="12" extension="inttype">
          <addr space="join" piece1="o4" piece2="o3" piece3="o2"/>
        </pentry>
        <pentry minsize="13" maxsize="16" extension="inttype">
          <addr space="join" piece1="o5" piece2="o4" piece3="o3" piece4="o2"/>
        </pentry>

@Ebiroll Could you review/merge it as actual master is not working with Ghidra 10.x ?

Issue with ghidra-xtensa e839137
Build OK even with Ghidra 10.2.2
Error when using Xtensa on an esp32 elf... with Ghidra 10.2.2
Exception reading Xtensa:LE:32:default/default(xtensa.cspec): join must overlap at least one previous entry
ghidra.program.model.lang.CompilerSpecNotFoundException: Exception reading Xtensa:LE:32:default/default(xtensa.cspec): join must overlap at least one previous entry
at ghidra.program.model.lang.BasicCompilerSpec.(BasicCompilerSpec.java:153)
at ghidra.app.plugin.processors.sleigh.SleighLanguage.getCompilerSpecByID(SleighLanguage.java:1148)
at ghidra.app.util.opinion.AbstractLibrarySupportLoader.doLoad(AbstractLibrarySupportLoader.java:708)
at ghidra.app.util.opinion.AbstractLibrarySupportLoader.loadProgram(AbstractLibrarySupportLoader.java:98)
at ghidra.app.util.opinion.AbstractProgramLoader.load(AbstractProgramLoader.java:126)
at ghidra.plugin.importer.ImporterUtilities.importSingleFile(ImporterUtilities.java:368)
at ghidra.plugin.importer.ImporterDialog.lambda$okCallback$7(ImporterDialog.java:351)
at ghidra.util.task.TaskBuilder$TaskBuilderTask.run(TaskBuilder.java:306)
at ghidra.util.task.Task.monitoredRun(Task.java:134)
at ghidra.util.task.TaskRunner.lambda$startTaskThread$0(TaskRunner.java:106)
at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
at java.base/java.lang.Thread.run(Thread.java:833)
Caused by: ghidra.xml.XmlParseException: join must overlap at least one previous entry
at ghidra.program.model.lang.ParamEntry.resolveJoin(ParamEntry.java:384)
at ghidra.program.model.lang.ParamEntry.restoreXml(ParamEntry.java:586)
at ghidra.program.model.lang.ParamListStandard.parsePentry(ParamListStandard.java:244)
at ghidra.program.model.lang.ParamListStandard.restoreXml(ParamListStandard.java:317)
at ghidra.program.model.lang.ParamListStandardOut.restoreXml(ParamListStandardOut.java:77)
at ghidra.program.model.lang.PrototypeModel.restoreXml(PrototypeModel.java:638)
at ghidra.program.model.lang.BasicCompilerSpec.addPrototypeModel(BasicCompilerSpec.java:1067)
at ghidra.program.model.lang.BasicCompilerSpec.restoreXml(BasicCompilerSpec.java:619)
at ghidra.program.model.lang.BasicCompilerSpec.initialize(BasicCompilerSpec.java:244)
at ghidra.program.model.lang.BasicCompilerSpec.(BasicCompilerSpec.java:131)
... 12 more

@Ebiroll
Copy link
Owner

Ebiroll commented Feb 9, 2023

Reviewed and fixed, sorry for delay.

@Ebiroll Ebiroll closed this Feb 9, 2023
austinc3030 pushed a commit to dynacylabs/ghidra-xtensa that referenced this pull request Nov 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants