Skip to content

Commit f3a755d

Browse files
author
Jordi Chauzi
committed
dpu: lldb: updating dpu host api result enum
1 parent 6e23bca commit f3a755d

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

lldb/source/Plugins/Process/Dpu/Dpu.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ bool Dpu::LoadElf(const FileSpec &elf_file_path) {
117117
ModuleSP elf_mod(new Module(elf_file_path, k_dpu_arch));
118118

119119
struct dpu_set_t set = dpu_set_from_dpu(m_dpu);
120-
dpu_result_t status = dpu_load(set, elf_file_path.GetCString(), NULL);
120+
dpu_error_t status = dpu_load(set, elf_file_path.GetCString(), NULL);
121121
if (status != DPU_OK)
122122
return false;
123123

@@ -394,7 +394,7 @@ StateType Dpu::StepThread(uint32_t thread_index, unsigned int *exit_status) {
394394
bool Dpu::WriteWRAM(uint32_t offset, const void *buf, size_t size) {
395395
std::lock_guard<std::recursive_mutex> guard(m_rank->GetLock());
396396

397-
dpu_result_t ret;
397+
dpu_error_t ret;
398398
// fast path, everything is aligned
399399
if (((offset & dpuword_size_mod) == 0) && ((size & dpuword_size_mod) == 0)) {
400400
const dpuword_t *words = static_cast<const dpuword_t *>(buf);
@@ -445,7 +445,7 @@ bool Dpu::ReadWRAM(uint32_t offset, void *buf, size_t size) {
445445
std::lock_guard<std::recursive_mutex> guard(m_rank->GetLock());
446446
dpuword_t *words = static_cast<dpuword_t *>(buf);
447447

448-
dpu_result_t ret;
448+
dpu_error_t ret;
449449
size_t final_size =
450450
size + sizeof(dpuword_t) - 1 + (offset & dpuword_size_mod);
451451

@@ -475,7 +475,7 @@ bool Dpu::ReadWRAM(uint32_t offset, void *buf, size_t size) {
475475
bool Dpu::WriteIRAM(uint32_t offset, const void *buf, size_t size) {
476476
std::lock_guard<std::recursive_mutex> guard(m_rank->GetLock());
477477

478-
dpu_result_t ret;
478+
dpu_error_t ret;
479479
// fast path, everything is aligned
480480
if (((offset & instruction_size_mod) == 0) &&
481481
((size & instruction_size_mod) == 0)) {
@@ -527,7 +527,7 @@ bool Dpu::ReadIRAM(uint32_t offset, void *buf, size_t size) {
527527
std::lock_guard<std::recursive_mutex> guard(m_rank->GetLock());
528528
dpuinstruction_t *instrs = static_cast<dpuinstruction_t *>(buf);
529529

530-
dpu_result_t ret;
530+
dpu_error_t ret;
531531
size_t final_size =
532532
size + sizeof(dpuinstruction_t) - 1 + (offset & instruction_size_mod);
533533

@@ -560,15 +560,15 @@ bool Dpu::WriteMRAM(uint32_t offset, const void *buf, size_t size) {
560560
std::lock_guard<std::recursive_mutex> guard(m_rank->GetLock());
561561
const uint8_t *bytes = static_cast<const uint8_t *>(buf);
562562

563-
dpu_result_t ret = dpu_copy_to_mram(m_dpu, offset, bytes, size, 0);
563+
dpu_error_t ret = dpu_copy_to_mram(m_dpu, offset, bytes, size, 0);
564564
return ret == DPU_OK;
565565
}
566566

567567
bool Dpu::ReadMRAM(uint32_t offset, void *buf, size_t size) {
568568
std::lock_guard<std::recursive_mutex> guard(m_rank->GetLock());
569569
uint8_t *bytes = static_cast<uint8_t *>(buf);
570570

571-
dpu_result_t ret = dpu_copy_from_mram(m_dpu, bytes, offset, size, 0);
571+
dpu_error_t ret = dpu_copy_from_mram(m_dpu, bytes, offset, size, 0);
572572
return ret == DPU_OK;
573573
}
574574

@@ -595,7 +595,7 @@ bool Dpu::GenerateSaveCore(const char *exe_path, const char *core_file_path,
595595
uint8_t *wram = new uint8_t[wram_size];
596596
uint8_t *mram = new uint8_t[mram_size];
597597

598-
dpu_result_t status;
598+
dpu_error_t status;
599599
if (wram != NULL && mram != NULL) {
600600
status = dpu_copy_from_wram_for_dpu(m_dpu, (dpuword_t *)wram, 0,
601601
nb_word_in_wram);

lldb/source/Plugins/Process/Dpu/DpuContext.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ bool DpuContext::ResumeThreads(llvm::SmallVector<uint32_t, 8> *resume_list) {
115115
return dpu_finalize_fault_process_for_dpu(m_dpu, m_context) == DPU_OK;
116116
}
117117

118-
dpu_result_t DpuContext::StepThread(uint32_t thread_index) {
118+
dpu_error_t DpuContext::StepThread(uint32_t thread_index) {
119119
ResetScheduling();
120120
ResetLastResumeThreads();
121121
AddThreadInScheduling(thread_index);
122122

123-
dpu_result_t ret =
123+
dpu_error_t ret =
124124
dpu_execute_thread_step_in_fault_for_dpu(m_dpu, thread_index, m_context);
125125
if (ret != DPU_OK)
126126
return ret;

lldb/source/Plugins/Process/Dpu/DpuContext.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class DpuContext {
5050

5151
bool StopThreads();
5252
bool ResumeThreads(llvm::SmallVector<uint32_t, 8> *resume_list);
53-
dpu_result_t StepThread(uint32_t thread_index);
53+
dpu_error_t StepThread(uint32_t thread_index);
5454

5555
unsigned int GetExitStatus();
5656
lldb::addr_t GetPcOfThread(dpu_thread_t thread);

0 commit comments

Comments
 (0)