diff options
author | mirabilos <thorsten.glaser@teckids.org> | 2017-03-25 23:02:26 +0300 |
---|---|---|
committer | mirabilos <thorsten.glaser@teckids.org> | 2017-03-25 23:02:26 +0300 |
commit | 7f061cc04bd9b1c945d25f855fbb34eb248c4fcb (patch) | |
tree | 65081353d1fad53f1366a771b64aa04aa26f2537 | |
parent | cd03880ac7aa8c009ee18d8cb33d12600c5ea1b3 (diff) |
let common.asm end in the .text section
-rw-r--r-- | src/amd64/cpuid_amd64.asm | 3 | ||||
-rw-r--r-- | src/amd64/rfxcodec_encode_dwt_shift_amd64_sse2.asm | 1 | ||||
-rw-r--r-- | src/amd64/rfxcodec_encode_dwt_shift_amd64_sse41.asm | 1 | ||||
-rw-r--r-- | src/common.asm | 3 | ||||
-rw-r--r-- | src/x86/cpuid_x86.asm | 3 | ||||
-rw-r--r-- | src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm | 1 | ||||
-rw-r--r-- | src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm | 1 |
7 files changed, 3 insertions, 10 deletions
diff --git a/src/amd64/cpuid_amd64.asm b/src/amd64/cpuid_amd64.asm index acc738e..7080782 100644 --- a/src/amd64/cpuid_amd64.asm +++ b/src/amd64/cpuid_amd64.asm @@ -1,7 +1,5 @@ %include "common.asm" -section .text - ;The first six integer or pointer arguments are passed in registers ;RDI, RSI, RDX, RCX, R8, and R9 @@ -33,4 +31,3 @@ PROC cpuid_amd64 pop rbx ret align 16 - diff --git a/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse2.asm b/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse2.asm index 69ccf07..8cf901e 100644 --- a/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse2.asm +++ b/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse2.asm @@ -1488,4 +1488,3 @@ PROC rfxcodec_encode_dwt_shift_amd64_sse2 pop rbx ret align 16 - diff --git a/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse41.asm b/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse41.asm index 2b19f81..34d8e50 100644 --- a/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse41.asm +++ b/src/amd64/rfxcodec_encode_dwt_shift_amd64_sse41.asm @@ -1356,4 +1356,3 @@ PROC rfxcodec_encode_dwt_shift_amd64_sse41 pop rbx ret align 16 - diff --git a/src/common.asm b/src/common.asm index 7e2b84b..8770777 100644 --- a/src/common.asm +++ b/src/common.asm @@ -1,5 +1,6 @@ ; ;Copyright 2017 Pavel Roskin +;Copyright 2017 mirabilos ; ;Permission to use, copy, modify, distribute, and sell this software and its ;documentation for any purpose is hereby granted without fee, provided that @@ -49,3 +50,5 @@ section .note.GNU-stack noalloc noexec nowrite progbits _%1: %endif %endmacro + +section .text diff --git a/src/x86/cpuid_x86.asm b/src/x86/cpuid_x86.asm index 4ddb8a2..b0b821f 100644 --- a/src/x86/cpuid_x86.asm +++ b/src/x86/cpuid_x86.asm @@ -1,7 +1,5 @@ %include "common.asm" -section .text - ;int ;cpuid_x86(int eax_in, int ecx_in, int *eax, int *ebx, int *ecx, int *edx) @@ -31,4 +29,3 @@ PROC cpuid_x86 pop ebx ret; align 16 - diff --git a/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm b/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm index fb8dd56..48a47d3 100644 --- a/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm +++ b/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm @@ -1546,4 +1546,3 @@ PROC rfxcodec_encode_dwt_shift_x86_sse2 mov eax, 0 ret align 16 - diff --git a/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm b/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm index 915e6ee..c9de0bb 100644 --- a/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm +++ b/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm @@ -1414,4 +1414,3 @@ PROC rfxcodec_encode_dwt_shift_x86_sse41 mov eax, 0 ret align 16 - |