ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove space-tab sequences 

There are not many, and they are all simple mistakes that ended up
being committed.  Remove them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20181213223737.11793-2-pbonzini@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-12-13 23:37:36 +01:00
parent 6afeb39713
commit 72e21db7ea
18 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsd-user/x86_64/target_syscall.h
View File

@ -12,7 +12,7 @@ struct target_pt_regs {
abi_ulong rbp; abi_ulong rbp;
abi_ulong rbx; abi_ulong rbx;
/* arguments: non interrupts/non tracing syscalls only save up to here */ /* arguments: non interrupts/non tracing syscalls only save up to here */
abi_ulong r11; abi_ulong r11;
abi_ulong r10; abi_ulong r10;
abi_ulong r9; abi_ulong r9;
abi_ulong r8; abi_ulong r8;

28
crypto/aes.c
View File

@ -1071,7 +1071,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
AES_KEY *key) { AES_KEY *key) {
u32 *rk; u32 *rk;
int i = 0; int i = 0;
u32 temp; u32 temp;
if (!userKey || !key) if (!userKey || !key)
@ -1160,7 +1160,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
rk[15] = rk[ 7] ^ rk[14]; rk[15] = rk[ 7] ^ rk[14];
rk += 8; rk += 8;
} }
} }
abort(); abort();
} }
@ -1247,7 +1247,7 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >> 8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[ 5]; t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >> 8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[ 5];
t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >> 8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[ 6]; t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >> 8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[ 6];
t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >> 8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[ 7]; t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >> 8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[ 7];
/* round 2: */ /* round 2: */
s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >> 8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[ 8]; s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >> 8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[ 8];
s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >> 8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[ 9]; s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >> 8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[ 9];
s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >> 8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[10]; s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >> 8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[10];
@ -1257,7 +1257,7 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >> 8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[13]; t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >> 8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[13];
t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >> 8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[14]; t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >> 8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[14];
t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >> 8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[15]; t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >> 8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[15];
/* round 4: */ /* round 4: */
s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >> 8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[16]; s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >> 8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[16];
s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >> 8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[17]; s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >> 8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[17];
s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >> 8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[18]; s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >> 8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[18];
@ -1267,7 +1267,7 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >> 8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[21]; t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >> 8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[21];
t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >> 8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[22]; t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >> 8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[22];
t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >> 8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[23]; t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >> 8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[23];
/* round 6: */ /* round 6: */
s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >> 8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[24]; s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >> 8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[24];
s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >> 8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[25]; s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >> 8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[25];
s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >> 8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[26]; s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >> 8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[26];
@ -1277,7 +1277,7 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >> 8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[29]; t1 = AES_Te0[s1 >> 24] ^ AES_Te1[(s2 >> 16) & 0xff] ^ AES_Te2[(s3 >> 8) & 0xff] ^ AES_Te3[s0 & 0xff] ^ rk[29];
t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >> 8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[30]; t2 = AES_Te0[s2 >> 24] ^ AES_Te1[(s3 >> 16) & 0xff] ^ AES_Te2[(s0 >> 8) & 0xff] ^ AES_Te3[s1 & 0xff] ^ rk[30];
t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >> 8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[31]; t3 = AES_Te0[s3 >> 24] ^ AES_Te1[(s0 >> 16) & 0xff] ^ AES_Te2[(s1 >> 8) & 0xff] ^ AES_Te3[s2 & 0xff] ^ rk[31];
/* round 8: */ /* round 8: */
s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >> 8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[32]; s0 = AES_Te0[t0 >> 24] ^ AES_Te1[(t1 >> 16) & 0xff] ^ AES_Te2[(t2 >> 8) & 0xff] ^ AES_Te3[t3 & 0xff] ^ rk[32];
s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >> 8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[33]; s1 = AES_Te0[t1 >> 24] ^ AES_Te1[(t2 >> 16) & 0xff] ^ AES_Te2[(t3 >> 8) & 0xff] ^ AES_Te3[t0 & 0xff] ^ rk[33];
s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >> 8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[34]; s2 = AES_Te0[t2 >> 24] ^ AES_Te1[(t3 >> 16) & 0xff] ^ AES_Te2[(t0 >> 8) & 0xff] ^ AES_Te3[t1 & 0xff] ^ rk[34];
@ -1569,33 +1569,33 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
* apply last round and * apply last round and
* map cipher state to byte array block: * map cipher state to byte array block:
*/ */
s0 = s0 =
(AES_Td4[(t0 >> 24) ] & 0xff000000) ^ (AES_Td4[(t0 >> 24) ] & 0xff000000) ^
(AES_Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ (AES_Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
(AES_Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ (AES_Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^
(AES_Td4[(t1 ) & 0xff] & 0x000000ff) ^ (AES_Td4[(t1 ) & 0xff] & 0x000000ff) ^
rk[0]; rk[0];
PUTU32(out , s0); PUTU32(out , s0);
s1 = s1 =
(AES_Td4[(t1 >> 24) ] & 0xff000000) ^ (AES_Td4[(t1 >> 24) ] & 0xff000000) ^
(AES_Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ (AES_Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
(AES_Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ (AES_Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^
(AES_Td4[(t2 ) & 0xff] & 0x000000ff) ^ (AES_Td4[(t2 ) & 0xff] & 0x000000ff) ^
rk[1]; rk[1];
PUTU32(out + 4, s1); PUTU32(out + 4, s1);
s2 = s2 =
(AES_Td4[(t2 >> 24) ] & 0xff000000) ^ (AES_Td4[(t2 >> 24) ] & 0xff000000) ^
(AES_Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ (AES_Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
(AES_Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ (AES_Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^
(AES_Td4[(t3 ) & 0xff] & 0x000000ff) ^ (AES_Td4[(t3 ) & 0xff] & 0x000000ff) ^
rk[2]; rk[2];
PUTU32(out + 8, s2); PUTU32(out + 8, s2);
s3 = s3 =
(AES_Td4[(t3 >> 24) ] & 0xff000000) ^ (AES_Td4[(t3 >> 24) ] & 0xff000000) ^
(AES_Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ (AES_Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
(AES_Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ (AES_Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^
(AES_Td4[(t0 ) & 0xff] & 0x000000ff) ^ (AES_Td4[(t0 ) & 0xff] & 0x000000ff) ^
rk[3]; rk[3];
PUTU32(out + 12, s3); PUTU32(out + 12, s3);
} }

8
disas/alpha.c
View File

@ -672,7 +672,7 @@ extract_ev6hwjhint(unsigned insn, int *invalid ATTRIBUTE_UNUSED)
OPCODE is the instruction opcode. OPCODE is the instruction opcode.
MASK is the opcode mask; this is used to tell the disassembler MASK is the opcode mask; this is used to tell the disassembler
which bits in the actual opcode must match OPCODE. which bits in the actual opcode must match OPCODE.
OPERANDS is the list of operands. OPERANDS is the list of operands.
@ -699,10 +699,10 @@ extract_ev6hwjhint(unsigned insn, int *invalid ATTRIBUTE_UNUSED)
And two annotations: And two annotations:
EV56 BUT opcodes that are officially introduced as of the ev56, EV56 BUT opcodes that are officially introduced as of the ev56,
but with defined results on previous implementations. but with defined results on previous implementations.
EV56 UNA opcodes that were introduced as of the ev56 with EV56 UNA opcodes that were introduced as of the ev56 with
presumably undefined results on previous implementations presumably undefined results on previous implementations
that were not assigned to a particular extension. that were not assigned to a particular extension.
*/ */
@ -832,7 +832,7 @@ const struct alpha_opcode alpha_opcodes[] = {
{ "cmovgt", OPR(0x11,0x66), BASE, ARG_OPR }, { "cmovgt", OPR(0x11,0x66), BASE, ARG_OPR },
{ "cmovgt", OPRL(0x11,0x66), BASE, ARG_OPRL }, { "cmovgt", OPRL(0x11,0x66), BASE, ARG_OPRL },
{ "implver", OPRL_(0x11,0x6C)|(31<<21)|(1<<13), { "implver", OPRL_(0x11,0x6C)|(31<<21)|(1<<13),
0xFFFFFFE0, BASE, { RC } }, /* ev56 but */ 0xFFFFFFE0, BASE, { RC } }, /* ev56 but */
{ "mskbl", OPR(0x12,0x02), BASE, ARG_OPR }, { "mskbl", OPR(0x12,0x02), BASE, ARG_OPR },
{ "mskbl", OPRL(0x12,0x02), BASE, ARG_OPRL }, { "mskbl", OPRL(0x12,0x02), BASE, ARG_OPRL },

2
disas/arm.c
View File

@ -1077,7 +1077,7 @@ static const struct opcode32 arm_opcodes[] =
%S print Thumb register (bits 3..5 as high number if bit 6 set) %S print Thumb register (bits 3..5 as high number if bit 6 set)
%D print Thumb register (bits 0..2 as high number if bit 7 set) %D print Thumb register (bits 0..2 as high number if bit 7 set)
%<bitfield>I print bitfield as a signed decimal %<bitfield>I print bitfield as a signed decimal
(top bit of range being the sign bit) (top bit of range being the sign bit)
%N print Thumb register mask (with LR) %N print Thumb register mask (with LR)
%O print Thumb register mask (with PC) %O print Thumb register mask (with PC)
%M print Thumb register mask %M print Thumb register mask

4
disas/i386.c
View File

@ -6075,7 +6075,7 @@ OP_EM (int bytemode, int sizeflag)
{ {
bytemode = (prefixes & PREFIX_DATA) ? x_mode : q_mode; bytemode = (prefixes & PREFIX_DATA) ? x_mode : q_mode;
used_prefixes |= (prefixes & PREFIX_DATA); used_prefixes |= (prefixes & PREFIX_DATA);
} }
OP_E (bytemode, sizeflag); OP_E (bytemode, sizeflag);
return; return;
} }
@ -6112,7 +6112,7 @@ OP_EMC (int bytemode, int sizeflag)
{ {
bytemode = (prefixes & PREFIX_DATA) ? x_mode : q_mode; bytemode = (prefixes & PREFIX_DATA) ? x_mode : q_mode;
used_prefixes |= (prefixes & PREFIX_DATA); used_prefixes |= (prefixes & PREFIX_DATA);
} }
OP_E (bytemode, sizeflag); OP_E (bytemode, sizeflag);
return; return;
} }

4
disas/m68k.c
View File

@ -350,7 +350,7 @@ struct m68k_opcode_alias
* all (modes 0-6,7.0-4) * all (modes 0-6,7.0-4)
~ alterable memory (modes 2-6,7.0,7.1) ~ alterable memory (modes 2-6,7.0,7.1)
(not 0,1,7.2-4) (not 0,1,7.2-4)
% alterable (modes 0-6,7.0,7.1) % alterable (modes 0-6,7.0,7.1)
(not 7.2-4) (not 7.2-4)
; data (modes 0,2-6,7.0-4) ; data (modes 0,2-6,7.0-4)
@ -1647,7 +1647,7 @@ print_insn_arg (const char *d,
case 0x15: name = "%val"; break; case 0x15: name = "%val"; break;
case 0x16: name = "%scc"; break; case 0x16: name = "%scc"; break;
case 0x17: name = "%ac"; break; case 0x17: name = "%ac"; break;
case 0x18: name = "%psr"; break; case 0x18: name = "%psr"; break;
case 0x19: name = "%pcsr"; break; case 0x19: name = "%pcsr"; break;
case 0x1c: case 0x1c:
case 0x1d: case 0x1d:

4
hw/usb/hcd-uhci.c
View File

@ -1056,8 +1056,8 @@ static void uhci_process_frame(UHCIState *s)
link = qh.link; link = qh.link;
} else { } else {
/* QH with elements */ /* QH with elements */
curr_qh = link; curr_qh = link;
link = qh.el_link; link = qh.el_link;
} }
continue; continue;
} }

2
include/hw/elf_ops.h
View File

@ -343,7 +343,7 @@ static int glue(load_elf, SZ)(const char *name, int fd,
} }
if (pentry) if (pentry)
*pentry = (uint64_t)(elf_sword)ehdr.e_entry; *pentry = (uint64_t)(elf_sword)ehdr.e_entry;
glue(load_symbols, SZ)(&ehdr, fd, must_swab, clear_lsb, sym_cb); glue(load_symbols, SZ)(&ehdr, fd, must_swab, clear_lsb, sym_cb);

2
linux-user/linuxload.c
View File

@ -54,7 +54,7 @@ static int prepare_binprm(struct linux_binprm *bprm)
/* Set-uid? */ /* Set-uid? */
if(mode & S_ISUID) { if(mode & S_ISUID) {
bprm->e_uid = st.st_uid; bprm->e_uid = st.st_uid;
} }
/* Set-gid? */ /* Set-gid? */

2
linux-user/syscall.c
View File

@ -902,7 +902,7 @@ abi_long do_brk(abi_ulong new_brk)
} }
target_brk = new_brk; target_brk = new_brk;
DEBUGF_BRK(TARGET_ABI_FMT_lx " (new_brk <= brk_page)\n", target_brk); DEBUGF_BRK(TARGET_ABI_FMT_lx " (new_brk <= brk_page)\n", target_brk);
return target_brk; return target_brk;
} }
/* We need to allocate more memory after the brk... Note that /* We need to allocate more memory after the brk... Note that

4
linux-user/syscall_defs.h
View File

@ -1807,7 +1807,7 @@ struct target_stat {
abi_ulong st_rdev; abi_ulong st_rdev;
abi_long st_size; abi_long st_size;
abi_long st_blksize; abi_long st_blksize;
abi_long st_blocks; /* Number 512-byte blocks allocated. */ abi_long st_blocks; /* Number 512-byte blocks allocated. */
abi_ulong target_st_atime; abi_ulong target_st_atime;
abi_ulong target_st_atime_nsec; abi_ulong target_st_atime_nsec;
@ -1816,7 +1816,7 @@ struct target_stat {
abi_ulong target_st_ctime; abi_ulong target_st_ctime;
abi_ulong target_st_ctime_nsec; abi_ulong target_st_ctime_nsec;
abi_long __unused[3]; abi_long __unused[3];
}; };
#elif defined(TARGET_S390X) #elif defined(TARGET_S390X)
struct target_stat { struct target_stat {

2
linux-user/x86_64/target_syscall.h
View File

@ -12,7 +12,7 @@ struct target_pt_regs {
abi_ulong rbp; abi_ulong rbp;
abi_ulong rbx; abi_ulong rbx;
/* arguments: non interrupts/non tracing syscalls only save up to here */ /* arguments: non interrupts/non tracing syscalls only save up to here */
abi_ulong r11; abi_ulong r11;
abi_ulong r10; abi_ulong r10;
abi_ulong r9; abi_ulong r9;
abi_ulong r8; abi_ulong r8;

4
slirp/ip_input.c
View File

@ -193,7 +193,7 @@ ip_input(struct mbuf *m)
m = dtom(slirp, ip); m = dtom(slirp, ip);
} else } else
if (fp) if (fp)
ip_freef(slirp, fp); ip_freef(slirp, fp);
} else } else
ip->ip_len -= hlen; ip->ip_len -= hlen;
@ -537,7 +537,7 @@ typedef uint32_t n_time;
if (opt == IPOPT_SSRR) { if (opt == IPOPT_SSRR) {
#define INA struct in_ifaddr * #define INA struct in_ifaddr *
#define SA struct sockaddr * #define SA struct sockaddr *
if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == 0) if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == 0)
ia = (INA)ifa_ifwithnet((SA)&ipaddr); ia = (INA)ifa_ifwithnet((SA)&ipaddr);
} else } else
ia = ip_rtaddr(ipaddr.sin_addr); ia = ip_rtaddr(ipaddr.sin_addr);

10
slirp/tcp_input.c
View File

@ -74,7 +74,7 @@
if (so->so_emu) { \ if (so->so_emu) { \
if (tcp_emu((so),(m))) sbappend((so), (m)); \ if (tcp_emu((so),(m))) sbappend((so), (m)); \
} else \ } else \
sbappend((so), (m)); \ sbappend((so), (m)); \
} else {\ } else {\
(flags) = tcp_reass((tp), (ti), (m)); \ (flags) = tcp_reass((tp), (ti), (m)); \
tp->t_flags |= TF_ACKNOW; \ tp->t_flags |= TF_ACKNOW; \
@ -1175,7 +1175,7 @@ trimthenstep6:
} }
break; break;
/* /*
* In CLOSING STATE in addition to the processing for * In CLOSING STATE in addition to the processing for
* the ESTABLISHED state if the ACK acknowledges our FIN * the ESTABLISHED state if the ACK acknowledges our FIN
* then enter the TIME-WAIT state, otherwise ignore * then enter the TIME-WAIT state, otherwise ignore
@ -1325,7 +1325,7 @@ dodata:
} }
switch (tp->t_state) { switch (tp->t_state) {
/* /*
* In SYN_RECEIVED and ESTABLISHED STATES * In SYN_RECEIVED and ESTABLISHED STATES
* enter the CLOSE_WAIT state. * enter the CLOSE_WAIT state.
*/ */
@ -1337,7 +1337,7 @@ dodata:
tp->t_state = TCPS_CLOSE_WAIT; tp->t_state = TCPS_CLOSE_WAIT;
break; break;
/* /*
* If still in FIN_WAIT_1 STATE FIN has not been acked so * If still in FIN_WAIT_1 STATE FIN has not been acked so
* enter the CLOSING state. * enter the CLOSING state.
*/ */
@ -1345,7 +1345,7 @@ dodata:
tp->t_state = TCPS_CLOSING; tp->t_state = TCPS_CLOSING;
break; break;
/* /*
* In FIN_WAIT_2 state enter the TIME_WAIT state, * In FIN_WAIT_2 state enter the TIME_WAIT state,
* starting the time-wait timer, turning off the other * starting the time-wait timer, turning off the other
* standard timers. * standard timers.

4
slirp/tcp_output.c
View File

@ -275,9 +275,9 @@ send:
memcpy((caddr_t)(opt + 2), (caddr_t)&mss, sizeof(mss)); memcpy((caddr_t)(opt + 2), (caddr_t)&mss, sizeof(mss));
optlen = 4; optlen = 4;
} }
} }
hdrlen += optlen; hdrlen += optlen;
/* /*
* Adjust data length if insertion of options will * Adjust data length if insertion of options will

2
slirp/tcp_timer.c
View File

@ -263,7 +263,7 @@ tcp_timers(register struct tcpcb *tp, int timer)
goto dropit; goto dropit;
if ((SO_OPTIONS) && tp->t_state <= TCPS_CLOSE_WAIT) { if ((SO_OPTIONS) && tp->t_state <= TCPS_CLOSE_WAIT) {
if (tp->t_idle >= TCPTV_KEEP_IDLE + TCP_MAXIDLE) if (tp->t_idle >= TCPTV_KEEP_IDLE + TCP_MAXIDLE)
goto dropit; goto dropit;
/* /*
* Send a packet designed to force a response * Send a packet designed to force a response

2
slirp/udp.c
View File

@ -310,7 +310,7 @@ udp_tos(struct socket *so)
while(udptos[i].tos) { while(udptos[i].tos) {
if ((udptos[i].fport && ntohs(so->so_fport) == udptos[i].fport) || if ((udptos[i].fport && ntohs(so->so_fport) == udptos[i].fport) ||
(udptos[i].lport && ntohs(so->so_lport) == udptos[i].lport)) { (udptos[i].lport && ntohs(so->so_lport) == udptos[i].lport)) {
so->so_emu = udptos[i].emu; so->so_emu = udptos[i].emu;
return udptos[i].tos; return udptos[i].tos;
} }
i++; i++;

10
tests/tcg/arm/hello-arm.c
View File

@ -78,9 +78,9 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
"mov\tr3,%4\n\t" \ "mov\tr3,%4\n\t" \
__syscall(name) \ __syscall(name) \
"mov\t%0,r0" \ "mov\t%0,r0" \
: "=r" (__res) \ : "=r" (__res) \
: "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3)),"r" ((long)(arg4)) \ : "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3)),"r" ((long)(arg4)) \
: "r0","r1","r2","r3","lr"); \ : "r0","r1","r2","r3","lr"); \
__syscall_return(type,__res); \ __syscall_return(type,__res); \
} }
@ -96,8 +96,8 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \
"mov\tr4,%5\n\t" \ "mov\tr4,%5\n\t" \
__syscall(name) \ __syscall(name) \
"mov\t%0,r0" \ "mov\t%0,r0" \
: "=r" (__res) \ : "=r" (__res) \
: "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3)),"r" ((long)(arg4)), \ : "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3)),"r" ((long)(arg4)), \
"r" ((long)(arg5)) \ "r" ((long)(arg5)) \
: "r0","r1","r2","r3","r4","lr"); \ : "r0","r1","r2","r3","r4","lr"); \
__syscall_return(type,__res); \ __syscall_return(type,__res); \