Skip to content

Commit ffd2a1e

Browse files
committed
[a64] Add arch-agnostic documentation configurations
Misses some during the first pass. Now the config files with mention a64 differences.
1 parent 4dbe6c3 commit ffd2a1e

File tree

7 files changed

+15
-7
lines changed

7 files changed

+15
-7
lines changed

src/xenia/cpu/backend/a64/a64_backend.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
DEFINE_int32(a64_extension_mask, -1,
3030
"Allow the detection and utilization of specific instruction set "
3131
"features.\n"
32-
" 0 = arm64v8\n"
32+
" 0 = armv8.0\n"
33+
" 1 = LSE\n"
34+
" 2 = F16C\n"
3335
" -1 = Detect and utilize all possible processor features\n",
3436
"a64");
3537

src/xenia/cpu/breakpoint.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ std::string Breakpoint::to_string() const {
4848
str += " " + functions[0]->name();
4949
return str;
5050
} else {
51-
return std::string("x64 ") + xe::string_util::to_hex_string(host_address());
51+
return std::string(XE_HOST_ARCH_NAME " ") +
52+
xe::string_util::to_hex_string(host_address());
5253
}
5354
}
5455

src/xenia/cpu/cpu_flags.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "xenia/cpu/cpu_flags.h"
1111

12-
DEFINE_string(cpu, "any", "CPU backend [any, x64].", "CPU");
12+
DEFINE_string(cpu, "any", "CPU backend [any, x64, a64].", "CPU");
1313

1414
DEFINE_string(
1515
load_module_map, "",

src/xenia/cpu/processor.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
#include "xenia/cpu/xex_module.h"
3535

3636
// TODO(benvanik): based on compiler support
37+
#ifdef XE_ARCH_AMD64
3738
#include "xenia/cpu/backend/x64/x64_backend.h"
39+
#elif XE_ARCH_ARM64
40+
#include "xenia/cpu/backend/a64/a64_backend.h"
41+
#endif // XE_ARCH
3842

3943
#if 0 && DEBUG
4044
#define DEFAULT_DEBUG_FLAG true

src/xenia/cpu/processor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class Processor {
162162
// This will cancel any active step operations and resume all threads.
163163
void Continue();
164164

165-
// Steps the given thread a single x64 host instruction.
165+
// Steps the given thread a single host instruction.
166166
// If the step is over a branch the branch will be followed.
167167
void StepHostInstruction(uint32_t thread_id);
168168

src/xenia/cpu/stack_walker_win.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ class Win32StackWalker : public StackWalker {
273273
if (function) {
274274
frame.guest_symbol.function = function;
275275
// Figure out where in guest code we are by looking up the
276-
// displacement in x64 from the JIT'ed code start to the PC.
276+
// displacement in bytes from the JIT'ed code start to the PC.
277277
if (function->is_guest()) {
278278
auto guest_function = static_cast<GuestFunction*>(function);
279279
// Adjust the host PC by -1 so that we will go back into whatever

src/xenia/cpu/testing/util.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#include "xenia/cpu/backend/x64/x64_backend.h"
1818
#elif XE_ARCH_ARM64
1919
#include "xenia/cpu/backend/a64/a64_backend.h"
20-
#endif
20+
#endif // XE_ARCH
21+
2122
#include "xenia/cpu/hir/hir_builder.h"
2223
#include "xenia/cpu/ppc/ppc_context.h"
2324
#include "xenia/cpu/ppc/ppc_frontend.h"
@@ -80,7 +81,7 @@ class TestFunction {
8081
uint32_t stack_address = memory_size - stack_size;
8182
uint32_t thread_state_address = stack_address - 0x1000;
8283
auto thread_state = std::make_unique<ThreadState>(processor.get(), 0x100);
83-
assert_always(); // TODO: Allocate a thread stack!!!
84+
// assert_always(); // TODO: Allocate a thread stack!!!
8485
auto ctx = thread_state->context();
8586
ctx->lr = 0xBCBCBCBC;
8687

0 commit comments

Comments
 (0)