From 66215afc2e09f0153a63d58d3baec25cf0122b7b Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 22 Jan 2016 03:39:07 +0000 Subject: move x32 sysinfo impl and syscall fixup code out of arch/x32/src all such arch-specific translation units are being moved to appropriate arch dirs under the main src tree. --- src/linux/x32/sysinfo.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ src/linux/x32/sysinfo.s | 1 - 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/linux/x32/sysinfo.c delete mode 100644 src/linux/x32/sysinfo.s (limited to 'src/linux') diff --git a/src/linux/x32/sysinfo.c b/src/linux/x32/sysinfo.c new file mode 100644 index 00000000..d1c1b148 --- /dev/null +++ b/src/linux/x32/sysinfo.c @@ -0,0 +1,50 @@ +#include +#include "syscall.h" +#include "libc.h" + +#define klong long long +#define kulong unsigned long long + +struct kernel_sysinfo { + klong uptime; + kulong loads[3]; + kulong totalram; + kulong freeram; + kulong sharedram; + kulong bufferram; + kulong totalswap; + kulong freeswap; + short procs; + short pad; + kulong totalhigh; + kulong freehigh; + unsigned mem_unit; +}; + +int __lsysinfo(struct sysinfo *info) +{ + struct kernel_sysinfo tmp; + int ret = syscall(SYS_sysinfo, &tmp); + if(ret == -1) return ret; + info->uptime = tmp.uptime; + info->loads[0] = tmp.loads[0]; + info->loads[1] = tmp.loads[1]; + info->loads[2] = tmp.loads[2]; + kulong shifts; + kulong max = tmp.totalram | tmp.totalswap; + __asm__("bsr %1,%0" : "=r"(shifts) : "r"(max)); + shifts = shifts >= 32 ? shifts - 31 : 0; + info->totalram = tmp.totalram >> shifts; + info->freeram = tmp.freeram >> shifts; + info->sharedram = tmp.sharedram >> shifts; + info->bufferram = tmp.bufferram >> shifts; + info->totalswap = tmp.totalswap >> shifts; + info->freeswap = tmp.freeswap >> shifts; + info->procs = tmp.procs ; + info->totalhigh = tmp.totalhigh >> shifts; + info->freehigh = tmp.freehigh >> shifts; + info->mem_unit = (tmp.mem_unit ? tmp.mem_unit : 1) << shifts; + return ret; +} + +weak_alias(__lsysinfo, sysinfo); diff --git a/src/linux/x32/sysinfo.s b/src/linux/x32/sysinfo.s deleted file mode 100644 index 53d79db2..00000000 --- a/src/linux/x32/sysinfo.s +++ /dev/null @@ -1 +0,0 @@ -# see arch/x32/src/sysinfo.c -- cgit v1.2.1