mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 23:03:54 -06:00
bsd-user: whitespace changes
Space after keywords, no space for function calls and spaces around operators. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Warner Losh <imp@bsdimp.com>
This commit is contained in:
parent
f9a576a818
commit
d60c3b932e
1 changed files with 20 additions and 20 deletions
|
@ -149,13 +149,13 @@ void cpu_loop(CPUX86State *env)
|
||||||
abi_ulong pc;
|
abi_ulong pc;
|
||||||
//target_siginfo_t info;
|
//target_siginfo_t info;
|
||||||
|
|
||||||
for(;;) {
|
for (;;) {
|
||||||
cpu_exec_start(cs);
|
cpu_exec_start(cs);
|
||||||
trapnr = cpu_exec(cs);
|
trapnr = cpu_exec(cs);
|
||||||
cpu_exec_end(cs);
|
cpu_exec_end(cs);
|
||||||
process_queued_cpu_work(cs);
|
process_queued_cpu_work(cs);
|
||||||
|
|
||||||
switch(trapnr) {
|
switch (trapnr) {
|
||||||
case 0x80:
|
case 0x80:
|
||||||
/* syscall from int $0x80 */
|
/* syscall from int $0x80 */
|
||||||
if (bsd_type == target_freebsd) {
|
if (bsd_type == target_freebsd) {
|
||||||
|
@ -344,7 +344,7 @@ void cpu_loop(CPUX86State *env)
|
||||||
{
|
{
|
||||||
int sig;
|
int sig;
|
||||||
|
|
||||||
sig = gdb_handlesig (env, TARGET_SIGTRAP);
|
sig = gdb_handlesig(env, TARGET_SIGTRAP);
|
||||||
if (sig)
|
if (sig)
|
||||||
{
|
{
|
||||||
info.si_signo = sig;
|
info.si_signo = sig;
|
||||||
|
@ -397,7 +397,7 @@ static inline void save_window_offset(CPUSPARCState *env, int cwp1)
|
||||||
printf("win_overflow: sp_ptr=0x" TARGET_ABI_FMT_lx " save_cwp=%d\n",
|
printf("win_overflow: sp_ptr=0x" TARGET_ABI_FMT_lx " save_cwp=%d\n",
|
||||||
sp_ptr, cwp1);
|
sp_ptr, cwp1);
|
||||||
#endif
|
#endif
|
||||||
for(i = 0; i < 16; i++) {
|
for (i = 0; i < 16; i++) {
|
||||||
/* FIXME - what to do if put_user() fails? */
|
/* FIXME - what to do if put_user() fails? */
|
||||||
put_user_ual(env->regbase[get_reg_index(env, cwp1, 8 + i)], sp_ptr);
|
put_user_ual(env->regbase[get_reg_index(env, cwp1, 8 + i)], sp_ptr);
|
||||||
sp_ptr += sizeof(abi_ulong);
|
sp_ptr += sizeof(abi_ulong);
|
||||||
|
@ -447,7 +447,7 @@ static void restore_window(CPUSPARCState *env)
|
||||||
printf("win_underflow: sp_ptr=0x" TARGET_ABI_FMT_lx " load_cwp=%d\n",
|
printf("win_underflow: sp_ptr=0x" TARGET_ABI_FMT_lx " load_cwp=%d\n",
|
||||||
sp_ptr, cwp1);
|
sp_ptr, cwp1);
|
||||||
#endif
|
#endif
|
||||||
for(i = 0; i < 16; i++) {
|
for (i = 0; i < 16; i++) {
|
||||||
/* FIXME - what to do if get_user() fails? */
|
/* FIXME - what to do if get_user() fails? */
|
||||||
get_user_ual(env->regbase[get_reg_index(env, cwp1, 8 + i)], sp_ptr);
|
get_user_ual(env->regbase[get_reg_index(env, cwp1, 8 + i)], sp_ptr);
|
||||||
sp_ptr += sizeof(abi_ulong);
|
sp_ptr += sizeof(abi_ulong);
|
||||||
|
@ -467,7 +467,7 @@ static void flush_windows(CPUSPARCState *env)
|
||||||
int offset, cwp1;
|
int offset, cwp1;
|
||||||
|
|
||||||
offset = 1;
|
offset = 1;
|
||||||
for(;;) {
|
for (;;) {
|
||||||
/* if restore would invoke restore_window(), then we can stop */
|
/* if restore would invoke restore_window(), then we can stop */
|
||||||
cwp1 = cpu_cwp_inc(env, env->cwp + offset);
|
cwp1 = cpu_cwp_inc(env, env->cwp + offset);
|
||||||
#ifndef TARGET_SPARC64
|
#ifndef TARGET_SPARC64
|
||||||
|
@ -647,11 +647,11 @@ void cpu_loop(CPUSPARCState *env)
|
||||||
#ifdef TARGET_SPARC64
|
#ifdef TARGET_SPARC64
|
||||||
badtrap:
|
badtrap:
|
||||||
#endif
|
#endif
|
||||||
printf ("Unhandled trap: 0x%x\n", trapnr);
|
printf("Unhandled trap: 0x%x\n", trapnr);
|
||||||
cpu_dump_state(cs, stderr, 0);
|
cpu_dump_state(cs, stderr, 0);
|
||||||
exit (1);
|
exit(1);
|
||||||
}
|
}
|
||||||
process_pending_signals (env);
|
process_pending_signals(env);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -824,15 +824,15 @@ int main(int argc, char **argv)
|
||||||
} else if (!strcmp(r, "cpu")) {
|
} else if (!strcmp(r, "cpu")) {
|
||||||
cpu_model = argv[optind++];
|
cpu_model = argv[optind++];
|
||||||
if (is_help_option(cpu_model)) {
|
if (is_help_option(cpu_model)) {
|
||||||
/* XXX: implement xxx_cpu_list for targets that still miss it */
|
/* XXX: implement xxx_cpu_list for targets that still miss it */
|
||||||
#if defined(cpu_list)
|
#if defined(cpu_list)
|
||||||
cpu_list();
|
cpu_list();
|
||||||
#endif
|
#endif
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
} else if (!strcmp(r, "B")) {
|
} else if (!strcmp(r, "B")) {
|
||||||
guest_base = strtol(argv[optind++], NULL, 0);
|
guest_base = strtol(argv[optind++], NULL, 0);
|
||||||
have_guest_base = true;
|
have_guest_base = true;
|
||||||
} else if (!strcmp(r, "drop-ld-preload")) {
|
} else if (!strcmp(r, "drop-ld-preload")) {
|
||||||
(void) envlist_unsetenv(envlist, "LD_PRELOAD");
|
(void) envlist_unsetenv(envlist, "LD_PRELOAD");
|
||||||
} else if (!strcmp(r, "bsd")) {
|
} else if (!strcmp(r, "bsd")) {
|
||||||
|
@ -957,7 +957,7 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (loader_exec(filename, argv+optind, target_environ, regs, info) != 0) {
|
if (loader_exec(filename, argv + optind, target_environ, regs, info) != 0) {
|
||||||
printf("Error loading %s\n", filename);
|
printf("Error loading %s\n", filename);
|
||||||
_exit(1);
|
_exit(1);
|
||||||
}
|
}
|
||||||
|
@ -1052,8 +1052,8 @@ int main(int argc, char **argv)
|
||||||
env->idt.limit = 255;
|
env->idt.limit = 255;
|
||||||
#endif
|
#endif
|
||||||
env->idt.base = target_mmap(0, sizeof(uint64_t) * (env->idt.limit + 1),
|
env->idt.base = target_mmap(0, sizeof(uint64_t) * (env->idt.limit + 1),
|
||||||
PROT_READ|PROT_WRITE,
|
PROT_READ | PROT_WRITE,
|
||||||
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
|
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||||
idt_table = g2h_untagged(env->idt.base);
|
idt_table = g2h_untagged(env->idt.base);
|
||||||
set_idt(0, 0);
|
set_idt(0, 0);
|
||||||
set_idt(1, 0);
|
set_idt(1, 0);
|
||||||
|
@ -1081,8 +1081,8 @@ int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
uint64_t *gdt_table;
|
uint64_t *gdt_table;
|
||||||
env->gdt.base = target_mmap(0, sizeof(uint64_t) * TARGET_GDT_ENTRIES,
|
env->gdt.base = target_mmap(0, sizeof(uint64_t) * TARGET_GDT_ENTRIES,
|
||||||
PROT_READ|PROT_WRITE,
|
PROT_READ | PROT_WRITE,
|
||||||
MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
|
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||||
env->gdt.limit = sizeof(uint64_t) * TARGET_GDT_ENTRIES - 1;
|
env->gdt.limit = sizeof(uint64_t) * TARGET_GDT_ENTRIES - 1;
|
||||||
gdt_table = g2h_untagged(env->gdt.base);
|
gdt_table = g2h_untagged(env->gdt.base);
|
||||||
#ifdef TARGET_ABI32
|
#ifdef TARGET_ABI32
|
||||||
|
@ -1122,9 +1122,9 @@ int main(int argc, char **argv)
|
||||||
env->pc = regs->pc;
|
env->pc = regs->pc;
|
||||||
env->npc = regs->npc;
|
env->npc = regs->npc;
|
||||||
env->y = regs->y;
|
env->y = regs->y;
|
||||||
for(i = 0; i < 8; i++)
|
for (i = 0; i < 8; i++)
|
||||||
env->gregs[i] = regs->u_regs[i];
|
env->gregs[i] = regs->u_regs[i];
|
||||||
for(i = 0; i < 8; i++)
|
for (i = 0; i < 8; i++)
|
||||||
env->regwptr[i] = regs->u_regs[i + 8];
|
env->regwptr[i] = regs->u_regs[i + 8];
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue