Checkpoint for dje.

diff --git a/sim/h8300/run.c b/sim/h8300/run.c
index a84d4fc12586ccbe96d6c7d6709657deb345e8d7..669c83f32388d755b784bc43091bc0be16beba2c 100644 (file)
--- a/sim/h8300/run.c
+++ b/sim/h8300/run.c
@@ -35,104 +35,53 @@ main (ac, av)
   char *name = "";
   for (i = 1; i < ac; i++)
     {
-<<<<<<< run.c
-      verbose ++;
-    }
-    else if (strcmp(av[i],"-t") == 0) 
-    {
-      trace = 1;
-    }
-    else if (strcmp(av[i],"-c") == 0) 
-    {
-      sim_csize(atoi(av[i+1]));
-      i++;
-=======
-      if (strcmp (av[i], "-v") == 0)
-       {
-         verbose = 1;
-       }
-      else if (strcmp (av[i], "-t") == 0)
+      if (strcmp(av[i],"-v") == 0)
+       verbose++;
+      
+      else if (strcmp(av[i],"-t") == 0) 
        {
          trace = 1;
        }
-
-      else
+      else if (strcmp(av[i],"-c") == 0) 
        {
-         name = av[i];
+         sim_csize(atoi(av[i+1]));
+         i++;
        }
->>>>>>> 1.4
-    }
-<<<<<<< run.c
-    else 
-=======
-  if (verbose)
->>>>>>> 1.4
-    {
-<<<<<<< run.c
-      name = av[i];
-=======
-      printf ("run %s\n", name);
->>>>>>> 1.4
-    }
-<<<<<<< run.c
-  }
-  if (verbose)
-  {
-    printf("run %s\n", name);
-  }
-  abfd = bfd_openr(name,"coff-h8300");
-=======
-  abfd = bfd_openr (name, "coff-h8300");
->>>>>>> 1.4
-
-<<<<<<< run.c
-  if (abfd) 
-=======
-  if (abfd)
->>>>>>> 1.4
-    {
-<<<<<<< run.c
-    if (bfd_check_format(abfd, bfd_object)) 
-    {
+  
+      else 
 
-      for (s = abfd->sections; s; s=s->next) 
-      {
-       char *buffer = malloc(bfd_section_size(abfd,s));
-       bfd_get_section_contents(abfd, s, buffer, 0, bfd_section_size(abfd,s));
-       sim_write(s->vma, buffer, bfd_section_size(abfd,s));
-      }
-
-      start_address = bfd_get_start_address(abfd);
-      sim_store_register(
-                        9,start_address);
-      sim_resume(0,0);
-         if (verbose)
-           sim_info (verbose);
-=======
-      if (bfd_check_format (abfd, bfd_object))
-       {
+       if (verbose)
+
+         {
+
+           name = av[i];
 
-         for (s = abfd->sections; s; s = s->next)
+           printf ("run %s\n", name);
+
+         }
+      abfd = bfd_openr (name, "coff-h8300");
+      if (abfd) 
+       {
+         if (bfd_check_format(abfd, bfd_object)) 
            {
-             char *buffer = malloc (bfd_section_size (abfd, s));
-             bfd_get_section_contents (abfd, s, buffer, 0, bfd_section_size (abfd, s));
-             sim_write (s->vma, buffer, bfd_section_size (abfd, s));
-           }
 
-         start_address = bfd_get_start_address (abfd);
-         sim_store_register (
-                              9, start_address);
-         sim_resume (0, 0);
-         if (verbose)
-           sim_info ();
->>>>>>> 1.4
-
-<<<<<<< run.c
-      return 0;
-=======
-         return 0;
+             for (s = abfd->sections; s; s=s->next) 
+               {
+                 char *buffer = malloc(bfd_section_size(abfd,s));
+                 bfd_get_section_contents(abfd, s, buffer, 0, bfd_section_size(abfd,s));
+                 sim_write(s->vma, buffer, bfd_section_size(abfd,s));
+               }
+
+             start_address = bfd_get_start_address(abfd);
+             sim_store_register(
+                                9,start_address);
+             sim_resume(0,0);
+             if (verbose)
+               sim_info (verbose);
+             return 0;
+           }
        }
->>>>>>> 1.4
+  
     }
 
   return 1;