Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Wim Lewis
nettle
Commits
759bbb3e
Commit
759bbb3e
authored
Apr 24, 2013
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added nettle_ prefix to memxor symbols.
parent
6223175f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
9 deletions
+22
-9
ChangeLog
ChangeLog
+9
-0
arm/memxor.asm
arm/memxor.asm
+4
-4
memxor.h
memxor.h
+4
-0
testsuite/symbols-test
testsuite/symbols-test
+1
-1
x86_64/memxor.asm
x86_64/memxor.asm
+4
-4
No files found.
ChangeLog
View file @
759bbb3e
2013-04-24 Niels Möller <nisse@lysator.liu.se>
* x86_64/memxor.asm: Added nettle_ prefix to symbols.
* arm/memxor.asm: Likewise.
* testsuite/symbols-test: Don't allow memxor functions without
nettle prefix,
* memxor.h (memxor3): Added name mangling to add "nettle_" prefix
to memxor and memxor3 symbols.
* Makefile.in (nettle_OBJS): Deleted $(LIBOBJS), and also deleted
LIBOBJS substitution.
(nettle_SOURCES): Added memxor.c, to include it in the library
...
...
arm/memxor.asm
View file @
759bbb3e
...
...
@@ -41,7 +41,7 @@ define(<TNC>, <r12>)
C
memxor
(
uint8_t
*
ds
t
,
const
uint8_t
*
src
,
si
ze_t
n
)
.align
4
PROLOGUE
(
memxor
)
PROLOGUE
(
nettle_
memxor
)
cmp
N
,
#
0
beq
.Lmemxor_done
...
...
@@ -214,7 +214,7 @@ PROLOGUE(memxor)
beq
.Lmemxor_done
b
.Lmemxor_bytes
EPILOGUE
(
memxor
)
EPILOGUE
(
nettle_
memxor
)
define
(
<
DS
T
>
,
<
r0
>
)
define
(
<
AP
>
,
<
r1
>
)
...
...
@@ -231,7 +231,7 @@ define(<BTNC>, <r12>)
C
memxor3
(
uint8_t
*
ds
t
,
const
uint8_t
*
a
,
const
uint8_t
*
b
,
si
ze_t
n
)
.align
2
PROLOGUE
(
memxor3
)
PROLOGUE
(
nettle_
memxor3
)
cmp
N
,
#
0
beq
.Lmemxor3_ret
...
...
@@ -485,4 +485,4 @@ PROLOGUE(memxor3)
add
AP
,
AP
,
ACNT
,
lsr
#
3
add
BP
,
BP
,
BCNT
,
lsr
#
3
b
.Lmemxor3_bytes
EPILOGUE
(
memxor3
)
EPILOGUE
(
nettle_
memxor3
)
memxor.h
View file @
759bbb3e
...
...
@@ -12,6 +12,10 @@
extern
"C"
{
#endif
/* Name mangling */
#define memxor nettle_memxor
#define memxor3 nettle_memxor3
uint8_t
*
memxor
(
uint8_t
*
dst
,
const
uint8_t
*
src
,
size_t
n
);
uint8_t
*
memxor3
(
uint8_t
*
dst
,
const
uint8_t
*
a
,
const
uint8_t
*
b
,
size_t
n
);
...
...
testsuite/symbols-test
View file @
759bbb3e
...
...
@@ -17,7 +17,7 @@ fi
# code.
(
$NM
-g
../libnettle.a
||
$NM
../libnettle.a
)
\
|
grep
' [DRT] '
| egrep
-v
'( |^)\.?_?(_?nettle_
|memxor
)|get_pc_thunk'
\
|
grep
' [DRT] '
| egrep
-v
'( |^)\.?_?(_?nettle_)|get_pc_thunk'
\
|
sort
-k3
>
test1.out
if
[
-s
test1.out
]
;
then
...
...
x86_64/memxor.asm
View file @
759bbb3e
...
...
@@ -38,18 +38,18 @@ define(<USE_SSE2>, <no>)
C
%
rdi
%
rsi
%
rdx
ALIGN
(
16
)
PROLOGUE
(
memxor
)
PROLOGUE
(
nettle_
memxor
)
W64_ENTRY
(
3
,
0
)
mov
%
rdx
,
%
r10
mov
%
rdi
,
%
rdx
jmp
.Lmemxor3_entry
EPILOGUE
(
memxor
)
EPILOGUE
(
nettle_
memxor
)
C
memxor3
(
uint8_t
*
ds
t
,
const
uint8_t
*
a
,
const
uint8_t
*
b
,
si
ze_t
n
)
C
%
rdi
%
rsi
%
rdx
%
rcx
ALIGN
(
16
)
PROLOGUE
(
memxor3
)
PROLOGUE
(
nettle_
memxor3
)
W64_ENTRY
(
4
,
0
)
C
%
cl
needed
for
shift
count
,
so
move
away
N
mov
%
rcx
,
N
...
...
@@ -258,4 +258,4 @@ ifelse(USE_SSE2, yes, <
>)
EPILOGUE
(
memxor3
)
EPILOGUE
(
nettle_
memxor3
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment