From 21cf617c69031111357d78c1fe10746fe5ef4f6e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 12 Apr 2010 16:53:33 +0000
Subject: sim: add missing values to array initializers

The sim code has a lot of static initializer for options and devices, but
since they aren't using newer struct style, they have to specify a value
for every option otherwise gcc spits a lot of warnings about "missing
initializer".  So add NULL/0 stubs for pointers/values.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 sim/common/sim-trace.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'sim/common/sim-trace.c')

diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index 358a01d..84db811 100644
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -85,63 +85,63 @@ static const OPTION trace_options[] =
   /* This table is organized to group related instructions together.  */
   { {"trace", optional_argument, NULL, 't'},
       't', "on|off", "Trace useful things",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-insn", optional_argument, NULL, OPTION_TRACE_INSN},
       '\0', "on|off", "Perform instruction tracing",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-decode", optional_argument, NULL, OPTION_TRACE_DECODE},
       '\0', "on|off", "Trace instruction decoding",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-extract", optional_argument, NULL, OPTION_TRACE_EXTRACT},
       '\0', "on|off", "Trace instruction extraction",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-linenum", optional_argument, NULL, OPTION_TRACE_LINENUM},
       '\0', "on|off", "Perform line number tracing (implies --trace-insn)",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-memory", optional_argument, NULL, OPTION_TRACE_MEMORY},
       '\0', "on|off", "Trace memory operations",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-alu", optional_argument, NULL, OPTION_TRACE_ALU},
       '\0', "on|off", "Trace ALU operations",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-fpu", optional_argument, NULL, OPTION_TRACE_FPU},
       '\0', "on|off", "Trace FPU operations",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-vpu", optional_argument, NULL, OPTION_TRACE_VPU},
       '\0', "on|off", "Trace VPU operations",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-branch", optional_argument, NULL, OPTION_TRACE_BRANCH},
       '\0', "on|off", "Trace branching",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-semantics", optional_argument, NULL, OPTION_TRACE_SEMANTICS},
       '\0', "on|off", "Perform ALU, FPU, MEMORY, and BRANCH tracing",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-model", optional_argument, NULL, OPTION_TRACE_MODEL},
       '\0', "on|off", "Include model performance data",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-core", optional_argument, NULL, OPTION_TRACE_CORE},
       '\0', "on|off", "Trace core operations",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-events", optional_argument, NULL, OPTION_TRACE_EVENTS},
       '\0', "on|off", "Trace events",
-      trace_option_handler },
+      trace_option_handler, NULL },
 #ifdef SIM_HAVE_ADDR_RANGE
   { {"trace-range", required_argument, NULL, OPTION_TRACE_RANGE},
       '\0', "START,END", "Specify range of addresses for instruction tracing",
-      trace_option_handler },
+      trace_option_handler, NULL },
 #if 0 /*wip*/
   { {"trace-function", required_argument, NULL, OPTION_TRACE_FUNCTION},
       '\0', "FUNCTION", "Specify function to trace",
-      trace_option_handler },
+      trace_option_handler, NULL },
 #endif
 #endif
   { {"trace-debug", optional_argument, NULL, OPTION_TRACE_DEBUG},
       '\0', "on|off", "Add information useful for debugging the simulator to the tracing output",
-      trace_option_handler },
+      trace_option_handler, NULL },
   { {"trace-file", required_argument, NULL, OPTION_TRACE_FILE},
       '\0', "FILE NAME", "Specify tracing output file",
-      trace_option_handler },
-  { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL }
+      trace_option_handler, NULL },
+  { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL, NULL }
 };
 
 /* Set/reset the trace options indicated in MASK.  */
-- 
cgit v1.1