ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing permute, I think.

This commit is contained in:
Ben Vanik 2014-10-25 15:23:27 -07:00
parent 07a7f36871
commit e767c2e90a
9 changed files with 67 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/alloy/backend/x64/x64_emitter.cc
View File

@ -835,6 +835,8 @@ Address X64Emitter::GetXmmConstPtr(XmmConst id) {
0x0000001Fu, 0x0000001Fu),
/* XMMShiftByteMask */ vec128i(0x000000FFu, 0x000000FFu,
0x000000FFu, 0x000000FFu),
/* XMMSwapWordMask */ vec128i(0x03030303u, 0x03030303u,
0x03030303u, 0x03030303u),
/* XMMUnsignedDwordMax */ vec128i(0xFFFFFFFFu, 0x00000000u,
0xFFFFFFFFu, 0x00000000u),
/* XMM255 */ vec128f(255.0f),

1
src/alloy/backend/x64/x64_emitter.h
View File

@ -67,6 +67,7 @@ enum XmmConst {
XMMShiftMaskEvenPI16,
XMMShiftMaskPS,
XMMShiftByteMask,
XMMSwapWordMask,
XMMUnsignedDwordMax,
XMM255,
XMMPI32,

8
src/alloy/backend/x64/x64_sequences.cc
View File

@ -4999,9 +4999,9 @@ EMITTER(PERMUTE_V128, MATCH(I<OPCODE_PERMUTE, V128<>, V128<>, V128<>, V128<>>))
// Control mask needs to be shuffled.
if (i.src1.is_constant) {
e.LoadConstantXmm(e.xmm0, i.src1.constant());
e.vpshufb(e.xmm0, e.xmm0, e.GetXmmConstPtr(XMMByteSwapMask));
e.vxorps(e.xmm0, e.xmm0, e.GetXmmConstPtr(XMMSwapWordMask));
} else {
e.vpshufb(e.xmm0, i.src1, e.GetXmmConstPtr(XMMByteSwapMask));
e.vxorps(e.xmm0, i.src1, e.GetXmmConstPtr(XMMSwapWordMask));
}
if (i.src2.is_constant) {
e.LoadConstantXmm(i.dest, i.src2.constant());
@ -5018,9 +5018,9 @@ EMITTER(PERMUTE_V128, MATCH(I<OPCODE_PERMUTE, V128<>, V128<>, V128<>, V128<>>))
// Control mask needs to be shuffled.
if (i.src1.is_constant) {
e.LoadConstantXmm(e.xmm2, i.src1.constant());
e.vpshufb(e.xmm2, e.xmm2, e.GetXmmConstPtr(XMMByteSwapMask));
e.vxorps(e.xmm2, e.xmm2, e.GetXmmConstPtr(XMMSwapWordMask));
} else {
e.vpshufb(e.xmm2, i.src1, e.GetXmmConstPtr(XMMByteSwapMask));
e.vxorps(e.xmm2, i.src1, e.GetXmmConstPtr(XMMSwapWordMask));
}
Xmm src2_shuf = e.xmm0;
if (i.src2.value->IsConstantZero()) {

BIN
src/alloy/frontend/ppc/test/bin/instr_lvl.bin Normal file
View File

Binary file not shown.

9
src/alloy/frontend/ppc/test/bin/instr_lvl.dis Normal file
View File

@ -0,0 +1,9 @@
/vagrant/src/alloy/frontend/ppc/test/bin//instr_lvl.o: file format elf64-powerpc
Disassembly of section .text:
0000000000100000 <test_lvl_1>:
100000: 7c 64 04 0e lvlx v3,r4,r0
100004: 4e 80 00 20 blr

1
src/alloy/frontend/ppc/test/bin/instr_lvl.map Normal file
View File

@ -0,0 +1 @@
0000000000000000 t test_lvl_1

7
src/alloy/frontend/ppc/test/instr_lvl.s Normal file
View File

@ -0,0 +1,7 @@
test_lvl_1:
#_ MEMORY_IN 00001077 0a 0b 0c 0d 0e 0f 10 13 0c 0d 0e 10 11 12 13 14 ff ff ff ff ff ff
#_ REGISTER_IN r4 0x1077
lvlx v3, r4, r0
blr
#_ REGISTER_OUT r4 0x1077
#_ REGISTER_OUT v3 [0A0B0C0D, 0E0F1013, 0C000000, 00000000]

2
src/alloy/test/test.gypi
View File

@ -57,7 +57,7 @@
#'test_atomic_exchange.cc',
#'test_atomic_sub.cc',
#'test_branch.cc',
#'test_byte_swap.cc',
'test_byte_swap.cc',
#'test_cast.cc',
#'test_cntlz.cc',
#'test_compare.cc',

42
src/alloy/test/test_byte_swap.cc Normal file
View File

@ -0,0 +1,42 @@
/**
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2014 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/
#include <alloy/test/util.h>
using namespace alloy;
using namespace alloy::hir;
using namespace alloy::runtime;
using namespace alloy::test;
using alloy::frontend::ppc::PPCContext;
TEST_CASE("BYTE_SWAP_V128", "[instr]") {
TestFunction([](hir::HIRBuilder& b) {
StoreVR(b, 3, b.ByteSwap(LoadVR(b, 4)));
b.Return();
}).Run([](PPCContext* ctx) {
ctx->v[4] = vec128b(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15);
},
[](PPCContext* ctx) {
auto result = ctx->v[3];
REQUIRE(result == vec128b(3, 2, 1, 0, 7, 6, 5, 4, 11,
10, 9, 8, 15, 14, 13, 12));
});
TestFunction([](hir::HIRBuilder& b) {
StoreVR(b, 3, b.ByteSwap(LoadVR(b, 4)));
b.Return();
}).Run([](PPCContext* ctx) {
ctx->v[4] = vec128i(0x0C13100F, 0x0E0D0C0B, 0x0A000000,
0x00000000);
},
[](PPCContext* ctx) {
auto result = ctx->v[3];
REQUIRE(result == vec128i(0x0F10130C, 0x0B0C0D0E, 0x0000000A, 0x00000000));
});
}