fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

Browse Source
This commit is contained in:
Gliniak
2022-07-17 21:27:52 +02:00
parent 23ca3725c4 14fdf4b270
commit 6e1e62378f
169 changed files with 39917 additions and 37685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/xenia/cpu/ppc/ppc_hir_builder.cc
View File

@@ -19,6 +19,7 @@
#include "xenia/base/logging.h"
#include "xenia/base/memory.h"
#include "xenia/base/profiling.h"
#include "xenia/base/string.h"
#include "xenia/cpu/cpu_flags.h"
#include "xenia/cpu/hir/label.h"
#include "xenia/cpu/ppc/ppc_context.h"
@@ -215,25 +216,25 @@ void PPCHIRBuilder::MaybeBreakOnInstruction(uint32_t address) {
auto op = cvars::break_condition_op.c_str();
// TODO(rick): table?
if (strcasecmp(op, "eq") == 0) {
if (xe_strcasecmp(op, "eq") == 0) {
TrapTrue(CompareEQ(left, right));
} else if (strcasecmp(op, "ne") == 0) {
} else if (xe_strcasecmp(op, "ne") == 0) {
TrapTrue(CompareNE(left, right));
} else if (strcasecmp(op, "slt") == 0) {
} else if (xe_strcasecmp(op, "slt") == 0) {
TrapTrue(CompareSLT(left, right));
} else if (strcasecmp(op, "sle") == 0) {
} else if (xe_strcasecmp(op, "sle") == 0) {
TrapTrue(CompareSLE(left, right));
} else if (strcasecmp(op, "sgt") == 0) {
} else if (xe_strcasecmp(op, "sgt") == 0) {
TrapTrue(CompareSGT(left, right));
} else if (strcasecmp(op, "sge") == 0) {
} else if (xe_strcasecmp(op, "sge") == 0) {
TrapTrue(CompareSGE(left, right));
} else if (strcasecmp(op, "ult") == 0) {
} else if (xe_strcasecmp(op, "ult") == 0) {
TrapTrue(CompareULT(left, right));
} else if (strcasecmp(op, "ule") == 0) {
} else if (xe_strcasecmp(op, "ule") == 0) {
TrapTrue(CompareULE(left, right));
} else if (strcasecmp(op, "ugt") == 0) {
} else if (xe_strcasecmp(op, "ugt") == 0) {
TrapTrue(CompareUGT(left, right));
} else if (strcasecmp(op, "uge") == 0) {
} else if (xe_strcasecmp(op, "uge") == 0) {
TrapTrue(CompareUGE(left, right));
} else {
assert_always();

7
src/xenia/cpu/ppc/ppc_translator.cc
View File

@@ -14,6 +14,7 @@
#include "xenia/base/memory.h"
#include "xenia/base/profiling.h"
#include "xenia/base/reset_scope.h"
#include "xenia/base/string.h"
#include "xenia/cpu/compiler/compiler_passes.h"
#include "xenia/cpu/cpu_flags.h"
#include "xenia/cpu/ppc/ppc_frontend.h"
@@ -155,7 +156,7 @@ bool PPCTranslator::Translate(GuestFunction* function,
// Stash source.
if (debug_info_flags & DebugInfoFlags::kDebugInfoDisasmSource) {
DumpSource(function, &string_buffer_);
debug_info->set_source_disasm(strdup(string_buffer_.buffer()));
debug_info->set_source_disasm(xe_strdup(string_buffer_.buffer()));
string_buffer_.Reset();
}
@@ -171,7 +172,7 @@ bool PPCTranslator::Translate(GuestFunction* function,
// Stash raw HIR.
if (debug_info_flags & DebugInfoFlags::kDebugInfoDisasmRawHir) {
builder_->Dump(&string_buffer_);
debug_info->set_raw_hir_disasm(strdup(string_buffer_.buffer()));
debug_info->set_raw_hir_disasm(xe_strdup(string_buffer_.buffer()));
string_buffer_.Reset();
}
@@ -183,7 +184,7 @@ bool PPCTranslator::Translate(GuestFunction* function,
// Stash optimized HIR.
if (debug_info_flags & DebugInfoFlags::kDebugInfoDisasmHir) {
builder_->Dump(&string_buffer_);
debug_info->set_hir_disasm(strdup(string_buffer_.buffer()));
debug_info->set_hir_disasm(xe_strdup(string_buffer_.buffer()));
string_buffer_.Reset();
}

2
src/xenia/cpu/ppc/testing/ppc_testing_main.cc
View File

@@ -425,7 +425,9 @@ bool RunTests(const std::string_view test_name) {
int failed_count = 0;
int passed_count = 0;
#if XE_ARCH_AMD64
XELOGI("Instruction feature mask {}.", cvars::x64_extension_mask);
#endif // XE_ARCH_AMD64
auto test_path_root = cvars::test_path;
std::vector<std::filesystem::path> test_files;