aboutsummaryrefslogtreecommitdiff
path: root/sim/h8300/compile.c
diff options
context:
space:
mode:
authorMichael Snyder <msnyder@vmware.com>2003-06-05 02:18:01 +0000
committerMichael Snyder <msnyder@vmware.com>2003-06-05 02:18:01 +0000
commit27ebfdf49b17a12647f8c744fee65986354b1994 (patch)
treeaa3b2b0d3719d30bcbe06a70ee3e1d999945c2f8 /sim/h8300/compile.c
parent828c9ae66896291b30bcb524b9684999731bf5ee (diff)
downloadgdb-27ebfdf49b17a12647f8c744fee65986354b1994.zip
gdb-27ebfdf49b17a12647f8c744fee65986354b1994.tar.gz
gdb-27ebfdf49b17a12647f8c744fee65986354b1994.tar.bz2
2003-06-04 Michael Snyder <msnyder@redhat.com>
* compile.c (sim_info): Fix typo in output. * h8300/compile.c (set_h8300h): Replace 'flag' arguments with a bfd_machine argument, and decode it inline. Check for bfd_mach_h8300hn and bfd_mach_h8300sn.
Diffstat (limited to 'sim/h8300/compile.c')
-rw-r--r--sim/h8300/compile.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/sim/h8300/compile.c b/sim/h8300/compile.c
index 33a28f5..c71658e 100644
--- a/sim/h8300/compile.c
+++ b/sim/h8300/compile.c
@@ -4748,15 +4748,20 @@ sim_info (SIM_DESC sd, int verbose)
FLAG is non-zero for the H8/300H. */
void
-set_h8300h (int h_flag, int s_flag, int sx_flag)
+set_h8300h (unsigned long machine)
{
/* FIXME: Much of the code in sim_load can be moved to sim_open.
This function being replaced by a sim_open:ARGV configuration
option. */
- h8300hmode = h_flag;
- h8300smode = s_flag;
- h8300sxmode = sx_flag;
+ if (machine == bfd_mach_h8300sx)
+ h8300sxmode = 1;
+
+ if (machine == bfd_mach_h8300s || machine == bfd_mach_h8300sn || h8300sxmode)
+ h8300smode = 1;
+
+ if (machine == bfd_mach_h8300h || machine == bfd_mach_h8300hn || h8300smode)
+ h8300hmode = 1;
}
/* Cover function of sim_state_free to free the cpu buffers as well. */
@@ -4873,14 +4878,7 @@ sim_load (SIM_DESC sd, char *prog, bfd *abfd, int from_tty)
and bfd_openr as sim_load_file checks too. */
if (bfd_check_format (prog_bfd, bfd_object))
{
- unsigned long mach = bfd_get_mach (prog_bfd);
-
- set_h8300h (mach == bfd_mach_h8300h ||
- mach == bfd_mach_h8300s ||
- mach == bfd_mach_h8300sx,
- mach == bfd_mach_h8300s ||
- mach == bfd_mach_h8300sx,
- mach == bfd_mach_h8300sx);
+ set_h8300h (bfd_get_mach (prog_bfd));
}
}