Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions arch/msp430/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ pub extern "C" fn CorePluginInit() -> bool {
// standardized one that is compatible with TI's compiler
let default = calling_convention::ConventionBuilder::new(arch)
.is_eligible_for_heuristics(true)
.int_arg_registers(&["r15", "r14", "r13", "r12"])
.return_int_reg("r15")
.return_hi_int_reg("r14")
.int_arg_registers(&["r12", "r13", "r14", "r15"])
.return_int_reg("r12")
.return_hi_int_reg("r13")
.register("default");
calling_convention::ConventionBuilder::new(arch)
.is_eligible_for_heuristics(true)
.return_int_reg("r15")
.return_hi_int_reg("r14")
.return_int_reg("r12")
.return_hi_int_reg("r13")
.register("stack");

arch.set_default_calling_convention(&default);
Expand Down
2 changes: 2 additions & 0 deletions view/elf/elfview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,7 @@ bool ElfView::Init()
Elf64SectionHeader symbolTableSection;

BeginBulkAddSegments();
GetParentView()->BeginBulkAddSegments();
uint64_t segmentStart = 0;
for (size_t i = 1; i < m_elfSections.size(); i++)
{
Expand Down Expand Up @@ -736,6 +737,7 @@ bool ElfView::Init()
}
}

GetParentView()->EndBulkAddSegments();
EndBulkAddSegments();
// Apply architecture and platform
if (!m_arch)
Expand Down
Loading