gas: run the hwcaps-bump tests with 64-bit sparc objects only.

[deliverable/binutils-gdb.git] / sim / m68hc11 / emulos.c

diff --git a/sim/m68hc11/emulos.c b/sim/m68hc11/emulos.c
index c3b86f020594cef71e2fffe0ae88c1aa99db2ddd..fe582d947af633667719ad5987c8d206d63f1699 100644 (file)
--- a/sim/m68hc11/emulos.c
+++ b/sim/m68hc11/emulos.c
@@ -1,5 +1,5 @@
 /* emulos.c -- Small OS emulation
-   Copyright 1999-2015 Free Software Foundation, Inc.
+   Copyright 1999-2016 Free Software Foundation, Inc.
    Written by Stephane Carrez (stcarrez@worldnet.fr)
 
 This file is part of GDB, GAS, and the GNU binutils.
@@ -33,8 +33,8 @@ static int bench_mode = -1;
 static struct timeval bench_start;
 static struct timeval bench_stop;
 
-void
-emul_bench (struct _sim_cpu* cpu)
+static void
+emul_bench (sim_cpu *cpu)
 {
   int op;
 
@@ -90,19 +90,19 @@ emul_bench (struct _sim_cpu* cpu)
 }
 #endif
 
-void
-emul_write(struct _sim_cpu* state)
+static void
+emul_write (sim_cpu *cpu)
 {
-  int addr = cpu_get_x (state) & 0x0FFFF;
-  int size = cpu_get_d (state) & 0x0FFFF;
+  int addr = cpu_get_x (cpu) & 0x0FFFF;
+  int size = cpu_get_d (cpu) & 0x0FFFF;
 
   if (addr + size > 0x0FFFF) {
     size = 0x0FFFF - addr;
   }
-  state->cpu_running = 0;
+  cpu->cpu_running = 0;
   while (size)
     {
-      uint8 val = memory_read8 (state, addr);
+      uint8 val = memory_read8 (cpu, addr);
         
       write(0, &val, 1);
       addr ++;
@@ -115,7 +115,7 @@ emul_write(struct _sim_cpu* state)
    But doing an exit () on a real target is really a non-sense.
    exit () is important for the validation of GCC.  The exit status
    is passed in 'D' register.  */
-void
+static void
 emul_exit (sim_cpu *cpu)
 {
   sim_engine_halt (CPU_STATE (cpu), cpu,
@@ -124,9 +124,9 @@ emul_exit (sim_cpu *cpu)
 }
 
 void
-emul_os (int code, sim_cpu *proc)
+emul_os (int code, sim_cpu *cpu)
 {
-  proc->cpu_current_cycle = 8;
+  cpu->cpu_current_cycle = 8;
   switch (code)
     {
     case 0x0:
@@ -134,7 +134,7 @@ emul_os (int code, sim_cpu *proc)
 
       /* 0xCD 0x01 */
     case 0x01:
-      emul_write (proc);
+      emul_write (cpu);
       break;
 
       /* 0xCD 0x02 */
@@ -143,13 +143,13 @@ emul_os (int code, sim_cpu *proc)
 
       /* 0xCD 0x03 */
     case 0x03:
-      emul_exit (proc);
+      emul_exit (cpu);
       break;
 
       /* 0xCD 0x04 */
     case 0x04:
 #ifndef WIN32
-      emul_bench (proc);
+      emul_bench (cpu);
 #endif
       break;