brain-hackers_pepepper-mirror
/
linux-brain
mirror of https://github.com/brain-hackers/linux-brain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xtensa: ISS: fix __simc implementation 

Do not rely on compiler implicitly placing function arguments into
specifc registers, place them explicitly.

Move __simc and related helpers to platform/simcall.h

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
This commit is contained in:
Max Filippov 2012-09-17 05:44:35 +04:00 committed by Chris Zankel
parent 33c8213d69
commit 717460ee3e
3 changed files with 53 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/xtensa/platforms/iss/console.c
View File

@ -41,19 +41,6 @@ static struct timer_list serial_timer;
static DEFINE_SPINLOCK(timer_lock);
int errno;
static int __simc (int a, int b, int c, int d, int e, int f) __attribute__((__noinline__));
static int __simc (int a, int b, int c, int d, int e, int f)
{
int ret;
__asm__ __volatile__ ("simcall\n"
"mov %0, a2\n"
"mov %1, a3\n" : "=a" (ret), "=a" (errno)
: : "a2", "a3");
return ret;
}
static char *serial_version = "0.1";
static char *serial_name = "ISS serial driver";

53
arch/xtensa/platforms/iss/include/platform/simcall.h
View File

@ -57,6 +57,59 @@
#define XTISS_SELECT_ONE_WRITE 2
#define XTISS_SELECT_ONE_EXCEPT 3
static int errno;
static inline int __simc(int a, int b, int c, int d, int e, int f)
{
int ret;
register int a1 asm("a2") = a;
register int b1 asm("a3") = b;
register int c1 asm("a4") = c;
register int d1 asm("a5") = d;
register int e1 asm("a6") = e;
register int f1 asm("a7") = f;
__asm__ __volatile__ (
"simcall\n"
"mov %0, a2\n"
"mov %1, a3\n"
: "=a" (ret), "=a" (errno), "+r"(a1), "+r"(b1)
: "r"(c1), "r"(d1), "r"(e1), "r"(f1)
: );
return ret;
}
static inline int simc_open(char *file, int flags, int mode)
{
return __simc(SYS_open, (int) file, flags, mode, 0, 0);
}
static inline int simc_close(int fd)
{
return __simc(SYS_close, fd, 0, 0, 0, 0);
}
static inline int simc_ioctl(int fd, int request, void *arg)
{
return __simc(SYS_ioctl, fd, request, (int) arg, 0, 0);
}
static inline int simc_read(int fd, void *buf, size_t count)
{
return __simc(SYS_read, fd, (int) buf, count, 0, 0);
}
static inline int simc_write(int fd, void *buf, size_t count)
{
return __simc(SYS_write, fd, (int) buf, count, 0, 0);
}
static inline int simc_poll(int fd)
{
struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
return __simc(SYS_select_one, fd, XTISS_SELECT_ONE_READ, (int)&tv,
0, 0);
}
#endif /* _XTENSA_PLATFORM_ISS_SIMCALL_H */

49
arch/xtensa/platforms/iss/network.c
View File

@ -101,55 +101,6 @@ struct iss_net_private {
};
/* ======================= ISS SIMCALL INTERFACE =========================== */
/* Note: __simc must _not_ be declared inline! */
static int errno;
static int __simc (int a, int b, int c, int d, int e, int f) __attribute__((__noinline__));
static int __simc (int a, int b, int c, int d, int e, int f)
{
int ret;
__asm__ __volatile__ ("simcall\n"
"mov %0, a2\n"
"mov %1, a3\n" : "=a" (ret), "=a" (errno)
: : "a2", "a3");
return ret;
}
static int inline simc_open(char *file, int flags, int mode)
{
return __simc(SYS_open, (int) file, flags, mode, 0, 0);
}
static int inline simc_close(int fd)
{
return __simc(SYS_close, fd, 0, 0, 0, 0);
}
static int inline simc_ioctl(int fd, int request, void *arg)
{
return __simc(SYS_ioctl, fd, request, (int) arg, 0, 0);
}
static int inline simc_read(int fd, void *buf, size_t count)
{
return __simc(SYS_read, fd, (int) buf, count, 0, 0);
}
static int inline simc_write(int fd, void *buf, size_t count)
{
return __simc(SYS_write, fd, (int) buf, count, 0, 0);
}
static int inline simc_poll(int fd)
{
struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
return __simc(SYS_select_one, fd, XTISS_SELECT_ONE_READ, (int)&tv,0,0);
}
/* ================================ HELPERS ================================ */