OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Replace 'extern inline' with 'static inline' 

Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2011-01-17 20:26:30 +00:00
parent 29718712eb
commit 4a6648f44e
10 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/cris/check_abs.c
View File

@ -4,13 +4,14 @@
#include "sys.h" #include "sys.h"
#include "crisutils.h" #include "crisutils.h"
extern inline int cris_abs(int n) { static inline int cris_abs(int n)
{
int r; int r;
asm ("abs\t%1, %0\n" : "=r" (r) : "r" (n)); asm ("abs\t%1, %0\n" : "=r" (r) : "r" (n));
return r; return r;
} }
extern inline void static inline void
verify_abs(int val, int res, verify_abs(int val, int res,
const int n, const int z, const int v, const int c) const int n, const int z, const int v, const int c)
{ {

3
tests/cris/check_addc.c
View File

@ -4,7 +4,8 @@
#include "sys.h" #include "sys.h"
#include "crisutils.h" #include "crisutils.h"
extern inline int cris_addc(int a, const int b) { static inline int cris_addc(int a, const int b)
{
asm ("addc\t%1, %0\n" : "+r" (a) : "r" (b)); asm ("addc\t%1, %0\n" : "+r" (a) : "r" (b));
return a; return a;
} }

6
tests/cris/check_addcm.c
View File

@ -5,13 +5,15 @@
#include "crisutils.h" #include "crisutils.h"
/* need to avoid acr as source here. */ /* need to avoid acr as source here. */
extern inline int cris_addc_m(int a, const int *b) { static inline int cris_addc_m(int a, const int *b)
{
asm volatile ("addc [%1], %0\n" : "+r" (a) : "r" (b)); asm volatile ("addc [%1], %0\n" : "+r" (a) : "r" (b));
return a; return a;
} }
/* 'b' is a crisv32 constrain to avoid postinc with $acr. */ /* 'b' is a crisv32 constrain to avoid postinc with $acr. */
extern inline int cris_addc_pi_m(int a, int **b) { static inline int cris_addc_pi_m(int a, int **b)
{
asm volatile ("addc [%1+], %0\n" : "+r" (a), "+b" (*b)); asm volatile ("addc [%1+], %0\n" : "+r" (a), "+b" (*b));
return a; return a;
} }

9
tests/cris/check_bound.c
View File

@ -4,19 +4,22 @@
#include "sys.h" #include "sys.h"
#include "crisutils.h" #include "crisutils.h"
extern inline int cris_bound_b(int v, int b) { static inline int cris_bound_b(int v, int b)
{
int r = v; int r = v;
asm ("bound.b\t%1, %0\n" : "+r" (r) : "ri" (b)); asm ("bound.b\t%1, %0\n" : "+r" (r) : "ri" (b));
return r; return r;
} }
extern inline int cris_bound_w(int v, int b) { static inline int cris_bound_w(int v, int b)
{
int r = v; int r = v;
asm ("bound.w\t%1, %0\n" : "+r" (r) : "ri" (b)); asm ("bound.w\t%1, %0\n" : "+r" (r) : "ri" (b));
return r; return r;
} }
extern inline int cris_bound_d(int v, int b) { static inline int cris_bound_d(int v, int b)
{
int r = v; int r = v;
asm ("bound.d\t%1, %0\n" : "+r" (r) : "ri" (b)); asm ("bound.d\t%1, %0\n" : "+r" (r) : "ri" (b));
return r; return r;

12
tests/cris/check_ftag.c
View File

@ -4,19 +4,23 @@
#include "sys.h" #include "sys.h"
#include "crisutils.h" #include "crisutils.h"
extern inline void cris_ftag_i(unsigned int x) { static inline void cris_ftag_i(unsigned int x)
{
register unsigned int v asm("$r10") = x; register unsigned int v asm("$r10") = x;
asm ("ftagi\t[%0]\n" : : "r" (v) ); asm ("ftagi\t[%0]\n" : : "r" (v) );
} }
extern inline void cris_ftag_d(unsigned int x) { static inline void cris_ftag_d(unsigned int x)
{
register unsigned int v asm("$r10") = x; register unsigned int v asm("$r10") = x;
asm ("ftagd\t[%0]\n" : : "r" (v) ); asm ("ftagd\t[%0]\n" : : "r" (v) );
} }
extern inline void cris_fidx_i(unsigned int x) { static inline void cris_fidx_i(unsigned int x)
{
register unsigned int v asm("$r10") = x; register unsigned int v asm("$r10") = x;
asm ("fidxi\t[%0]\n" : : "r" (v) ); asm ("fidxi\t[%0]\n" : : "r" (v) );
} }
extern inline void cris_fidx_d(unsigned int x) { static inline void cris_fidx_d(unsigned int x)
{
register unsigned int v asm("$r10") = x; register unsigned int v asm("$r10") = x;
asm ("fidxd\t[%0]\n" : : "r" (v) ); asm ("fidxd\t[%0]\n" : : "r" (v) );
} }

6
tests/cris/check_int64.c
View File

@ -5,11 +5,13 @@
#include "crisutils.h" #include "crisutils.h"
extern inline int64_t add64(const int64_t a, const int64_t b) { static inline int64_t add64(const int64_t a, const int64_t b)
{
return a + b; return a + b;
} }
extern inline int64_t sub64(const int64_t a, const int64_t b) { static inline int64_t sub64(const int64_t a, const int64_t b)
{
return a - b; return a - b;
} }

2
tests/cris/check_lz.c
View File

@ -3,7 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include "sys.h" #include "sys.h"
extern inline int cris_lz(int x) static inline int cris_lz(int x)
{ {
int r; int r;
asm ("lz\t%1, %0\n" : "=r" (r) : "r" (x)); asm ("lz\t%1, %0\n" : "=r" (r) : "r" (x));

2
tests/cris/check_swap.c
View File

@ -9,7 +9,7 @@
#define B 2 #define B 2
#define R 1 #define R 1
extern inline int cris_swap(const int mode, int x) static inline int cris_swap(const int mode, int x)
{ {
switch (mode) switch (mode)
{ {

20
tests/cris/crisutils.h
View File

@ -10,57 +10,57 @@ void _err(void) {
_fail(tst_cc_loc); _fail(tst_cc_loc);
} }
extern inline void cris_tst_cc_n1(void) static inline void cris_tst_cc_n1(void)
{ {
asm volatile ("bpl _err\n" asm volatile ("bpl _err\n"
"nop\n"); "nop\n");
} }
extern inline void cris_tst_cc_n0(void) static inline void cris_tst_cc_n0(void)
{ {
asm volatile ("bmi _err\n" asm volatile ("bmi _err\n"
"nop\n"); "nop\n");
} }
extern inline void cris_tst_cc_z1(void) static inline void cris_tst_cc_z1(void)
{ {
asm volatile ("bne _err\n" asm volatile ("bne _err\n"
"nop\n"); "nop\n");
} }
extern inline void cris_tst_cc_z0(void) static inline void cris_tst_cc_z0(void)
{ {
asm volatile ("beq _err\n" asm volatile ("beq _err\n"
"nop\n"); "nop\n");
} }
extern inline void cris_tst_cc_v1(void) static inline void cris_tst_cc_v1(void)
{ {
asm volatile ("bvc _err\n" asm volatile ("bvc _err\n"
"nop\n"); "nop\n");
} }
extern inline void cris_tst_cc_v0(void) static inline void cris_tst_cc_v0(void)
{ {
asm volatile ("bvs _err\n" asm volatile ("bvs _err\n"
"nop\n"); "nop\n");
} }
extern inline void cris_tst_cc_c1(void) static inline void cris_tst_cc_c1(void)
{ {
asm volatile ("bcc _err\n" asm volatile ("bcc _err\n"
"nop\n"); "nop\n");
} }
extern inline void cris_tst_cc_c0(void) static inline void cris_tst_cc_c0(void)
{ {
asm volatile ("bcs _err\n" asm volatile ("bcs _err\n"
"nop\n"); "nop\n");
} }
extern inline void cris_tst_mov_cc(int n, int z) static inline void cris_tst_mov_cc(int n, int z)
{ {
if (n) cris_tst_cc_n1(); else cris_tst_cc_n0(); if (n) cris_tst_cc_n1(); else cris_tst_cc_n0();
if (z) cris_tst_cc_z1(); else cris_tst_cc_z0(); if (z) cris_tst_cc_z1(); else cris_tst_cc_z0();
asm volatile ("" : : "g" (_err)); asm volatile ("" : : "g" (_err));
} }
extern inline void cris_tst_cc(const int n, const int z, static inline void cris_tst_cc(const int n, const int z,
const int v, const int c) const int v, const int c)
{ {
if (n) cris_tst_cc_n1(); else cris_tst_cc_n0(); if (n) cris_tst_cc_n1(); else cris_tst_cc_n0();

4
tests/hello-i386.c
View File

@ -1,6 +1,6 @@
#include <asm/unistd.h> #include <asm/unistd.h>
extern inline volatile void exit(int status) static inline volatile void exit(int status)
{ {
int __res; int __res;
__asm__ volatile ("movl %%ecx,%%ebx\n"\ __asm__ volatile ("movl %%ecx,%%ebx\n"\
@ -8,7 +8,7 @@ extern inline volatile void exit(int status)
: "=a" (__res) : "0" (__NR_exit),"c" ((long)(status))); : "=a" (__res) : "0" (__NR_exit),"c" ((long)(status)));
} }
extern inline int write(int fd, const char * buf, int len) static inline int write(int fd, const char * buf, int len)
{ {
int status; int status;
__asm__ volatile ("pushl %%ebx\n"\ __asm__ volatile ("pushl %%ebx\n"\