Commit: 2bb20c887d2222685ea51da8469b251bfd1afaa2 - binutils_gdb (git)

Commit MetaInfo

• Revisão: 2bb20c887d2222685ea51da8469b251bfd1afaa2 (tree)
• Hora: 2016-01-08 23:32:07
• Autor: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Mensagem de Log

Fix warning for clang.

Mudança Sumário

• modified: sim/h8300/compile.c

Diff

--- a/sim/h8300/compile.c
+++ b/sim/h8300/compile.c
@@ -28,6 +28,8 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
+#include <unistd.h>
+#include <ctype.h>
 
 #include "bfd.h"
 #include "sim-main.h"
@@ -1266,7 +1268,7 @@ static struct memlog *memlog_buffer;
 static int memlogtail;
 static int memlogsize;
 
-static add_memlog(unsigned long pc, unsigned long addr, 
+static void add_memlog(unsigned long pc, unsigned long addr, 
 		  enum mem_access_type type, unsigned long data)
 {
   if (!logging)
@@ -1289,7 +1291,7 @@ static int pc;
 
 static unsigned char  *breg[32];
 static unsigned short *wreg[16];
-static unsigned int   *lreg[18];
+static unsigned int   *lreg[19];
 
 #define GET_B_REG(X)     *(breg[X])
 #define SET_B_REG(X, Y) (*(breg[X])) = (Y)
@@ -1817,10 +1819,11 @@ init_pointers (SIM_DESC sd)
       /* `msize' must be a power of two.  */
       if ((memory_size & (memory_size - 1)) != 0)
 	{
+	  memory_size = H8300S_MSIZE;
 	  (*sim_callback->printf_filtered) 
 	    (sim_callback,
 	     "init_pointers: bad memory size %d, defaulting to %d.\n", 
-	     memory_size, memory_size = H8300S_MSIZE);
+	     memory_size, H8300S_MSIZE);
 	}
 
       if (h8_get_memory_buf (sd))
@@ -1962,6 +1965,7 @@ static int intlevel(SIM_DESC sd)
   } else {
     return h8_get_ccr (sd) & 0x80?0x100 << 8:-1;
   }
+  return 0;
 }
 
 int iosimulation(SIM_DESC, int);
@@ -4722,8 +4726,6 @@ sim_write (SIM_DESC sd, SIM_ADDR addr, const unsigned char *buffer, int size)
   int i;
 
   init_pointers (sd);
-  if (addr < 0)
-    return 0;
   for (i = 0; i < size; i++)
     {
       if (addr < memory_size)
@@ -4743,8 +4745,6 @@ int
 sim_read (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size)
 {
   init_pointers (sd);
-  if (addr < 0)
-    return 0;
   if (addr < memory_size)
     memcpy (buffer, h8_get_memory_buf (sd) + addr, size);
   else
@@ -5096,6 +5096,8 @@ sim_open (SIM_OPEN_KIND kind,
 
 /* Called by gdb to load a program into memory.  */
 
+void init_ioregs(SIM_DESC sd);
+
 SIM_RC
 sim_load (SIM_DESC sd, const char *prog, bfd *abfd, int from_tty)
 {
@@ -5243,7 +5245,7 @@ static void save_trace(const char *filename)
       return ;
     }
   for (idx = 0; idx < tracetail; idx++)
-    fprintf(fp, "0x%06x\n", trace_buffer[idx]);
+    fprintf(fp, "0x%06lx\n", trace_buffer[idx]);
   fclose(fp);
 }
 
@@ -5261,7 +5263,7 @@ static void show_memlog(int lines)
   for (; lines > 0; --lines)
     {
       (*sim_callback->printf_filtered) (sim_callback,
-					"0x%06x 0x%06x %s %08x\n",
+					"0x%06lx 0x%06lx %s %08lx\n",
 					memlog_buffer[idx].pc,
 					memlog_buffer[idx].addr,
 					memtype_str[memlog_buffer[idx].type],
@@ -5288,7 +5290,7 @@ static void save_memlog(const char *filename)
       return ;
     }
   for (idx = 0; idx < memlogtail; idx++)
-    fprintf(fp, "0x%06x 0x%06x %s %08x\n",
+    fprintf(fp, "0x%06lx 0x%06lx %s %08lx\n",
 	    memlog_buffer[idx].pc,
 	    memlog_buffer[idx].addr,
 	    memtype_str[memlog_buffer[idx].type],
@@ -5296,6 +5298,9 @@ static void save_memlog(const char *filename)
   fclose(fp);
 }
 
+void sci_open_pty(struct host_callback_struct *callback);
+void sci_open_net(struct host_callback_struct *callback, int port);
+
 void
 sim_do_command (SIM_DESC sd, const char *cmd)
 {