From 9ed911cdad27574a4146893f15e43287562ed7ac Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Wed, 22 May 2013 21:11:27 -0700 Subject: [PATCH] Fixing comparisons and disabling OutputDebugString logging. --- src/xenia/cpu/libjit/libjit_emitter.cc | 6 ++++-- src/xenia/logging.cc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/xenia/cpu/libjit/libjit_emitter.cc b/src/xenia/cpu/libjit/libjit_emitter.cc index 101da3636..d4d05c760 100644 --- a/src/xenia/cpu/libjit/libjit_emitter.cc +++ b/src/xenia/cpu/libjit/libjit_emitter.cc @@ -1171,8 +1171,10 @@ void LibjitEmitter::update_cr_with_cond( rhs = make_unsigned(rhs); } jit_value_t c = jit_insn_lt(fn_, lhs, rhs); - c = jit_insn_or(fn_, jit_insn_gt(fn_, lhs, rhs), c); - c = jit_insn_or(fn_, jit_insn_eq(fn_, lhs, rhs), c); + c = jit_insn_or(fn_, c, + jit_insn_shl(fn_, jit_insn_gt(fn_, lhs, rhs), get_uint32(1))); + c = jit_insn_or(fn_, c, + jit_insn_shl(fn_, jit_insn_eq(fn_, lhs, rhs), get_uint32(2))); // TODO(benvanik): set bit 4 to XER[SO] diff --git a/src/xenia/logging.cc b/src/xenia/logging.cc index 025680cc6..7553eec2a 100644 --- a/src/xenia/logging.cc +++ b/src/xenia/logging.cc @@ -45,7 +45,7 @@ void xe_log_line(const char* file_path, const uint32_t line_number, outfmt = "XE[%c] %s:%d: %s\n"; } -#if defined(OutputDebugString) +#if 0// defined(OutputDebugString) char full_output[kLogMax]; if (xesnprintfa(full_output, XECOUNT(buffer), outfmt, level_char, filename, line_number, buffer) >= 0) {