diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/avx_accel.S | 39 | ||||
| -rw-r--r-- | src/main.c | 25 | ||||
| -rw-r--r-- | src/sse_accel.S | 43 |
4 files changed, 21 insertions, 89 deletions
@@ -1,8 +1,7 @@ CFLAGS = -pedantic -Iinclude/ CFILES = src/main.c -ASMFILES = src/sse_accel.S src/avx_accel.S CC = gcc -bin/fobfuscate: $(CFILES) $(ASMFILES) +bin/fobfuscate: $(CFILES) mkdir -p $(@D) $(CC) $(CFLAGS) $^ -o $@ diff --git a/src/avx_accel.S b/src/avx_accel.S deleted file mode 100644 index cec088d..0000000 --- a/src/avx_accel.S +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora team. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Osmora nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -.section .text -.globl accel_invert256 - -accel_invert256: - vmovdqu (%rdi), %ymm1 // Load data into %ymm1 - vpcmpeqb %ymm0, %ymm0, %ymm0 // Set %ymm0 to all 1s - - vpxor %ymm1, %ymm0, %ymm0 // NOT %ymm1; result stored in %ymm0 - vmovdqu %ymm0, (%rax) // Writeback the result - retq @@ -34,9 +34,6 @@ #include <assert.h> #include <unistd.h> #include <info.h> -#if defined(__x86_64__) -#include <accel.h> -#endif /* defined(__x86_64__) */ #if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ #error "Big endian machines not supported yet" @@ -176,12 +173,30 @@ encrypt(const struct cpu_info *info, char *buf, size_t buf_size) step >>= 1; switch (step) { +#if defined(__x86_64__) case 32: - accel_invert256((uintptr_t)buf + current_pos); + __asm__ __volatile__( + "vmovdqu (%0), %%ymm1\n" /* Load data into %YMM1 */ + "vpcmpeqb %%ymm0, %%ymm0, %%ymm0\n" /* Set %YMM0 to 1s */ + "vpxor %%ymm1, %%ymm0, %%ymm0\n" /* NOT %YMM1 -> %YMM0 */ + "vmovdqu %%ymm0, (%1)\n" /* Writeback result */ + : + : "r" ((uintptr_t)buf + current_pos), + "r" ((uintptr_t)buf + current_pos) + ); break; case 16: - accel_invert128((uintptr_t)buf + current_pos); + __asm__ __volatile__( + "movdqu (%0), %%xmm0\n" /* Read 128 bits -> %XMM0 */ + "pcmpeqb %%xmm1, %%xmm1\n" /* Set %XMM1 to all 1s */ + "pxor %%xmm0, %%xmm1\n" /* NOT %XMM0 -> %XMM1 */ + "movdqu %%xmm1, (%0)\n" + : + : "r" ((uintptr_t)buf + current_pos), + "r" ((uintptr_t)buf + current_pos) + ); break; +#endif case 8: flip_block(tmp, uint64_t, buf, current_pos); break; diff --git a/src/sse_accel.S b/src/sse_accel.S deleted file mode 100644 index 7149833..0000000 --- a/src/sse_accel.S +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora team. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Osmora nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -.section .text -.globl accel_invert128 - - /* - * accel_invert128(uint64_t addr) - */ -accel_invert128: - movq %rdi, %rax // Store first argument in %rax - movdqu (%rax), %xmm0 // Read 128 bits from ptr in %rax into %xmm0 - - pcmpeqb %xmm1, %xmm1 // Set %xmm1 to all 1s - pxor %xmm0, %xmm1 // NOT %xmm0; result stored in %xmm1 - movdqu %xmm1, (%rax) // Writeback the result - retq |