Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
9c6a7cab
Commit
9c6a7cab
authored
Aug 12, 2016
by
James Zern
Committed by
Gerrit Code Review
Aug 12, 2016
Browse files
Merge "vpx_mem/: apply clang-format" into nextgenv2
parents
d2697fce
031d46c9
Changes
5
Hide whitespace changes
Inline
Side-by-side
vpx_mem/include/vpx_mem_intrnl.h
View file @
9c6a7cab
...
...
@@ -8,24 +8,24 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
#define VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
#include
"./vpx_config.h"
#define ADDRESS_STORAGE_SIZE
sizeof(size_t)
#define ADDRESS_STORAGE_SIZE sizeof(size_t)
#ifndef DEFAULT_ALIGNMENT
#
if defined(VXWORKS)
# define DEFAULT_ALIGNMENT 32
/*default addr alignment to use i
n
calls to vpx_* functions other
than vpx_memalign*/
#
else
#
define DEFAULT_ALIGNMENT
(2 * sizeof(void*))
/* NOLINT */
#
endif
#if defined(VXWORKS)
/*default addr alignment to use in calls to vpx_* functions other tha
n
* vpx_memalign*/
#define DEFAULT_ALIGNMENT 32
#else
#define DEFAULT_ALIGNMENT (2 * sizeof(void
*))
/* NOLINT */
#endif
#endif
/*returns an addr aligned to the byte boundary specified by align*/
#define align_addr(addr,align) (void*)(((size_t)(addr) + ((align) - 1)) & (size_t)-(align))
#define align_addr(addr, align) \
(void *)(((size_t)(addr) + ((align)-1)) & (size_t) - (align))
#endif // VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_
vpx_mem/vpx_mem.c
View file @
9c6a7cab
...
...
@@ -8,7 +8,6 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include
"vpx_mem.h"
#include
<stdio.h>
#include
<stdlib.h>
...
...
@@ -17,8 +16,7 @@
#include
"vpx/vpx_integer.h"
void
*
vpx_memalign
(
size_t
align
,
size_t
size
)
{
void
*
addr
,
*
x
=
NULL
;
void
*
addr
,
*
x
=
NULL
;
addr
=
malloc
(
size
+
align
-
1
+
ADDRESS_STORAGE_SIZE
);
...
...
@@ -31,24 +29,20 @@ void *vpx_memalign(size_t align, size_t size) {
return
x
;
}
void
*
vpx_malloc
(
size_t
size
)
{
return
vpx_memalign
(
DEFAULT_ALIGNMENT
,
size
);
}
void
*
vpx_malloc
(
size_t
size
)
{
return
vpx_memalign
(
DEFAULT_ALIGNMENT
,
size
);
}
void
*
vpx_calloc
(
size_t
num
,
size_t
size
)
{
void
*
x
;
x
=
vpx_memalign
(
DEFAULT_ALIGNMENT
,
num
*
size
);
if
(
x
)
memset
(
x
,
0
,
num
*
size
);
if
(
x
)
memset
(
x
,
0
,
num
*
size
);
return
x
;
}
void
*
vpx_realloc
(
void
*
memblk
,
size_t
size
)
{
void
*
addr
,
*
new_addr
=
NULL
;
void
*
addr
,
*
new_addr
=
NULL
;
int
align
=
DEFAULT_ALIGNMENT
;
/*
...
...
@@ -64,16 +58,17 @@ void *vpx_realloc(void *memblk, size_t size) {
else
if
(
!
size
)
vpx_free
(
memblk
);
else
{
addr
=
(
void
*
)(((
size_t
*
)
memblk
)[
-
1
]);
addr
=
(
void
*
)(((
size_t
*
)
memblk
)[
-
1
]);
memblk
=
NULL
;
new_addr
=
realloc
(
addr
,
size
+
align
+
ADDRESS_STORAGE_SIZE
);
if
(
new_addr
)
{
addr
=
new_addr
;
new_addr
=
(
void
*
)(((
size_t
)
((
unsigned
char
*
)
new_addr
+
ADDRESS_STORAGE_SIZE
)
+
(
align
-
1
))
&
(
size_t
)
-
align
);
new_addr
=
(
void
*
)(((
size_t
)((
unsigned
char
*
)
new_addr
+
ADDRESS_STORAGE_SIZE
)
+
(
align
-
1
))
&
(
size_t
)
-
align
);
/* save the actual malloc address */
((
size_t
*
)
new_addr
)[
-
1
]
=
(
size_t
)
addr
;
}
...
...
@@ -93,8 +88,7 @@ void vpx_free(void *memblk) {
void
*
vpx_memset16
(
void
*
dest
,
int
val
,
size_t
length
)
{
size_t
i
;
uint16_t
*
dest16
=
(
uint16_t
*
)
dest
;
for
(
i
=
0
;
i
<
length
;
i
++
)
*
dest16
++
=
val
;
for
(
i
=
0
;
i
<
length
;
i
++
)
*
dest16
++
=
val
;
return
dest
;
}
#endif // CONFIG_VP9_HIGHBITDEPTH
vpx_mem/vpx_mem.h
View file @
9c6a7cab
...
...
@@ -8,13 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VPX_MEM_VPX_MEM_H_
#define VPX_MEM_VPX_MEM_H_
#include
"vpx_config.h"
#if defined(__uClinux__)
#
include <lddk.h>
#include
<lddk.h>
#endif
#include
<stdlib.h>
...
...
@@ -24,20 +23,20 @@
extern
"C"
{
#endif
void
*
vpx_memalign
(
size_t
align
,
size_t
size
);
void
*
vpx_malloc
(
size_t
size
);
void
*
vpx_calloc
(
size_t
num
,
size_t
size
);
void
*
vpx_realloc
(
void
*
memblk
,
size_t
size
);
void
vpx_free
(
void
*
memblk
);
void
*
vpx_memalign
(
size_t
align
,
size_t
size
);
void
*
vpx_malloc
(
size_t
size
);
void
*
vpx_calloc
(
size_t
num
,
size_t
size
);
void
*
vpx_realloc
(
void
*
memblk
,
size_t
size
);
void
vpx_free
(
void
*
memblk
);
#if CONFIG_VP9_HIGHBITDEPTH
void
*
vpx_memset16
(
void
*
dest
,
int
val
,
size_t
length
);
void
*
vpx_memset16
(
void
*
dest
,
int
val
,
size_t
length
);
#endif
#include
<string.h>
#ifdef VPX_MEM_PLTFRM
#
include VPX_MEM_PLTFRM
#include VPX_MEM_PLTFRM
#endif
#if defined(__cplusplus)
...
...
vpx_ports/arm_cpudetect.c
View file @
9c6a7cab
...
...
@@ -76,27 +76,28 @@ int arm_cpu_caps(void) {
* All of these instructions should be essentially nops.
*/
#if HAVE_MEDIA
if
(
mask
&
HAS_MEDIA
)
__try
{
if
(
mask
&
HAS_MEDIA
)
{
__try
{
/*SHADD8 r3,r3,r3*/
__emit
(
0xE6333F93
);
flags
|=
HAS_MEDIA
;
}
__except
(
GetExceptionCode
()
==
EXCEPTION_ILLEGAL_INSTRUCTION
)
{
/*Ignore exception.*/
}
}
}
#endif
/* HAVE_MEDIA */
#if HAVE_NEON || HAVE_NEON_ASM
if
(
mask
&
HAS_NEON
)
{
__try
{
/*VORR q0,q0,q0*/
__emit
(
0xF2200150
);
flags
|=
HAS_NEON
;
}
__except
(
GetExceptionCode
()
==
EXCEPTION_ILLEGAL_INSTRUCTION
)
{
/*Ignore exception.*/
if
(
mask
&
HAS_NEON
)
{
__try
{
/*VORR q0,q0,q0*/
__emit
(
0xF2200150
);
flags
|=
HAS_NEON
;
}
__except
(
GetExceptionCode
()
==
EXCEPTION_ILLEGAL_INSTRUCTION
)
{
/*Ignore exception.*/
}
}
}
#endif
/* HAVE_NEON || HAVE_NEON_ASM */
return
flags
&
mask
;
return
flags
&
mask
;
}
#elif defined(__ANDROID__)
/* end _MSC_VER */
...
...
vpx_ports/x86.h
View file @
9c6a7cab
...
...
@@ -102,10 +102,17 @@ typedef enum {
} while (0)
#endif
#else
#define cpuid(func, func2, a, b, c, d) \
__asm mov eax, func __asm mov ecx, func2 __asm cpuid __asm mov a, \
eax __asm mov b, ebx __asm mov c, ecx __asm mov d, edx
/* clang-format off */
#define cpuid(func, func2, a, b, c, d) \
__asm mov eax, func \
__asm mov ecx, func2 \
__asm cpuid \
__asm mov a, eax \
__asm mov b, ebx \
__asm mov c, ecx \
__asm mov d, edx
#endif
/* clang-format on */
#endif
/* end others */
// NaCl has no support for xgetbv or the raw opcode.
...
...
Write
Preview
Supports
Markdown
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