JehanneOS
/
devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

usyscall: purge syscall macros

This commit is contained in:
Giacomo Tesio 2019-11-27 01:52:24 +01:00
parent 558d3985e9
commit 15b4c0b6b9
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/jehanne/cmd/usyscalls/usyscalls.go
View File

@ -31,7 +31,7 @@ import (
const gplHeader string = `/* const gplHeader string = `/*
* This file is part of Jehanne. * This file is part of Jehanne.
* *
* Copyright (C) 2016 Giacomo Tesio <giacomo@tesio.it> * Copyright (C) 2016-2019 Giacomo Tesio <giacomo@tesio.it>
* *
* Jehanne is free software: you can redistribute it and/or modify * Jehanne is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -173,7 +173,7 @@ func getHeaderData(calls []SyscallConf) *HeaderCode {
func generateSyscallTable(calls []SyscallConf){ func generateSyscallTable(calls []SyscallConf){
code := getHeaderData(calls) code := getHeaderData(calls)
tmpl, err := template.New("tab.c").Parse(` tmpl, err := template.New("tab.c").Parse(`
{{ range .Wrappers }}"{{ .Name }}", (int(*)()) {{ .Name }}, {{ range .Wrappers }}"{{ .Name }}", (int(*)()) sys_{{ .Name }},
{{ end }} {{ end }}
`) `)
err = tmpl.Execute(os.Stdout, code) err = tmpl.Execute(os.Stdout, code)
@ -189,9 +189,9 @@ func generateLibcCode(calls []SyscallConf){
#include <u.h> #include <u.h>
{{ range .Wrappers }} {{ range .Wrappers }}
#pragma weak {{ .Name }} #pragma weak sys_{{ .Name }}
{{ .RetType }} {{ .RetType }}
{{ .Name }}({{ .FuncArgs }}) sys_{{ .Name }}({{ .FuncArgs }})
{ {
register {{ .RetType }} __ret asm ("rax"); register {{ .RetType }} __ret asm ("rax");
__asm__ __volatile__ ( __asm__ __volatile__ (
@ -224,34 +224,10 @@ typedef enum Syscalls
{{ end }}} Syscalls; {{ end }}} Syscalls;
#ifndef KERNEL #ifndef KERNEL
{{ range .Wrappers }}
#define sys_{{ .Name }}({{ .MacroArgs }}) ({ \ {{ range .Wrappers }}extern {{ .RetType }} sys_{{ .Name }}({{ .FuncArgs }});
{{ range .VarValues }}{{.}}{{end}}{{ range .Vars }}{{.}}{{end}}register {{ .RetType }} __ret asm ("rax"); \
__asm__ __volatile__ ( \
"syscall" \
: "=&r" (__ret) \
: {{ .AsmArgs }} \
: {{ .AsmClobbers }} \
); \
__ret; })
{{ end }} {{ end }}
#ifdef PORTABLE_SYSCALLS
{{ range .Wrappers }}extern {{ .RetType }} {{ .Name }}({{ .FuncArgs }});
{{ end }}
extern int32_t read(int, void*, int32_t);
extern int32_t write(int, const void*, int32_t);
#else
{{ range .Wrappers }}# define {{ .Name }}(...) sys_{{ .Name }}(__VA_ARGS__)
{{ end }}
#define read(fd, buf, size) pread(fd, buf, size, -1)
#define write(fd, buf, size) pwrite(fd, buf, size, -1)
#endif
#endif #endif
`) `)
err = tmpl.Execute(os.Stdout, code) err = tmpl.Execute(os.Stdout, code)