resolved conflicts for merge of dc6c2b77 to master
Change-Id: Ifab4573a825cf5caa7158d8888243bb8d5d01148
This commit is contained in:
@@ -1,32 +0,0 @@
|
||||
/* autogenerated by gensyscalls.py */
|
||||
#include <sys/linux-syscalls.h>
|
||||
|
||||
.text
|
||||
.type personality, @function
|
||||
.globl personality
|
||||
.align 4
|
||||
|
||||
personality:
|
||||
|
||||
/* invoke trap */
|
||||
mov.l 0f, r3 /* trap num */
|
||||
trapa #(1 + 0x10)
|
||||
|
||||
/* check return value */
|
||||
cmp/pz r0
|
||||
bt __NR_personality_end
|
||||
|
||||
/* keep error number */
|
||||
sts.l pr, @-r15
|
||||
mov.l 1f, r1
|
||||
jsr @r1
|
||||
mov r0, r4
|
||||
lds.l @r15+, pr
|
||||
|
||||
__NR_personality_end:
|
||||
rts
|
||||
nop
|
||||
|
||||
.align 2
|
||||
0: .long __NR_personality
|
||||
1: .long __set_syscall_errno
|
||||
@@ -364,23 +364,6 @@ class State:
|
||||
"idname" : idname }
|
||||
return mips_call % t
|
||||
|
||||
def superh_genstub(self, fname, flags, idname):
|
||||
numargs = int(flags)
|
||||
t = { "fname" : fname,
|
||||
"idname" : idname,
|
||||
"numargs" : numargs }
|
||||
superh_call = superh_header
|
||||
if flags:
|
||||
if numargs == 5:
|
||||
superh_call += superh_5args_header
|
||||
if numargs == 6:
|
||||
superh_call += superh_6args_header
|
||||
if numargs == 7:
|
||||
superh_call += superh_7args_header
|
||||
superh_call += superh_call_default
|
||||
return superh_call % t
|
||||
|
||||
|
||||
def process_file(self,input):
|
||||
parser = SysCallsTxtParser()
|
||||
parser.parse_file(input)
|
||||
|
||||
Reference in New Issue
Block a user