Initial creation of sourceware repositorygdb-4_18-branchpoint

11 files changed, 10212 insertions, 0 deletions

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
new file mode 100644
index 0000000..73b8c92
--- /dev/null
+++ b/sim/d10v/ChangeLog
@@ -0,0 +1,974 @@
+1999-01-26  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* simops.c (OP_5607): Correct saturation comparison/assignment.
+	(OP_1201, OP_1203, OP_17001200, OP_17001202, 
+         OP_2A00, OP_2800, OP_2C00, OP_3200, OP_3201, 
+         OP_1001, OP_1003, OP_17001000, OP_17001002): Ditto.
+
+1999-01-26  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* simops.c (OP_5605): Sign extend MIN32 and MAX32 before saturation
+        comparison.
+	(OP_5607): Ditto.
+	(OP_2A00): Ditto.
+	(OP_2800): Ditto.
+
+1999-01-13  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* simops.c (OP_1223): Sign extend MIN32 and MAX32 before saturation
+	comparison.
+
+Tue Nov 24 17:04:43 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (sys/syscall.h): Include targ-vals.h instead.
+	(SYS_*): Replace with TARGET_SYS_*.
+
+	* Makefile.in: Add dependency on targ-vals.h.
+	(NL_TARGET): Define as NL_TARGET_d10v.
+
+Wed Sep 30 00:06:32 1998  Andrew Cagney  <cagney@amy.cygnus.com>
+
+	* interp.c (xfer_mem): Missing break, instruction memory case
+ 	flowed into unified memory case.
+
+Wed Sep 30 10:14:18 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* simops.c: If load instruction with auto increment/decrement
+	addressing is used when the destination register is the same as
+	the address register, then ignore the auto increment/decrement.
+
+Tue Apr 28 18:33:31 1998  Geoffrey Noer  <noer@cygnus.com>
+
+        * configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Sun Apr 26 15:31:55 1998  Tom Tromey  <tromey@creche>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+	* config.in: Ditto.
+
+Sun Apr 26 15:20:23 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* acconfig.h: New file.
+	* configure.in: Reverted change of Apr 24; use sinclude again.
+
+Fri Apr 24 14:16:40 1998  Tom Tromey  <tromey@creche>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+	* config.in: Ditto.
+
+Fri Apr 24 11:20:06 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* configure.in: Don't call sinclude.
+
+Fri Apr 24 11:04:46 1998  Andrew Cagney  <cagney@chook.cygnus.com>
+
+	* interp.c (struct hash_entry): OPCODE and MASK are unsigned.
+
+	* d10v_sim.h (remote-sim.h, sim-config.h): Include.
+	
+Sat Apr  4 20:36:25 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Wed Apr  1 12:59:17 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (trace_input_func): Use move_from_cr / CREGS to obtain
+ 	up-to-date CR value.
+	(OP_OP_1000000, add3): Trace inputs before performing add.
+	(OP_5F00, <*>): Trace input registers before making system call.
+	(OP_5F00, <kill>): Trace R0, R1 not REGn.
+	(OP_5F00, <getpid>): Always return 47.
+	
+	* d10v_sim.h (SLOT, SLOT_NR, SLOT_PEND_MASK, SLOT_PEND,
+ 	SLOT_DISCARD, SLOT_FLUSH): Define.  An implementation of write
+ 	back slots.
+	(struct _state): Add struct slot slot to global state variable.
+	(struct _state): Delete fields SM, EA, DB, DM, IE, RP, MD, FX, ST,
+ 	F0, F1, C from global State variable.
+	(struct _state): Add struct trace to global State variable.
+	(GPR, SET_GPR): Define.  SET_GPR uses SLOT_PEND.
+	(PSW*, SET_PSW*): Define. SET_PSW* uses SET_CREG.
+	(CREG, SET_CREG, SET_*): Define. SET_CREG uses func move_to_cr.
+	(INC_ADDR): Re-implement.  Use SET_GPR to update registers.
+	(JMP): Re-implement. Use SET_* to update registers.
+
+	* interp.c: Use new SET_* et.al. macros to fetch / store
+ 	registers.
+	(get_operands): Squirrel away trace values at start of each
+ 	operand decode.
+	(do_2_short): Flush pending writes before issuing second
+ 	instruction.
+	(sim_resume): Flush pending writes at end of instruction cycle.
+	(sim_fetch_register, sim_store_register, sim_create_inferior):
+ 	After scheduling updates to registers using SET_*, flush updates.
+	(sim_resume): Re-order handling of RPT/repeat and IBA/hbreak so
+ 	that each sets pc using SET_* and last SET_* eventually winds out.
+	
+	* simops.c: Use new SET_* et.al. macros to fetch / store
+ 	registers.
+	(move_to_cr): Add MASK argument for selective update of CREG bits.
+  	Re-implement using new SET_* macros.
+	(trace_output_func, trace_output): Delete. Replace with.
+	(do_trace_output_flush, trace_output_finish, trace_output_40,
+ 	trace_output_32, trace_output_16, trace_output_void,
+ 	trace_output_flag): New functions.  Handle specific trace cases.
+	(OP_*): Re-write tracing to use new trace_output_* functions.
+	(OP_*): Re-write to use new SET_* et.al. macros.
+	(FUNC, PARM[1-4], RETVAL, RETVAL32): Redo definition.
+	(RETVAL_HIGH, RETVAL_LOW): Delete, use RETVAL32.
+	
+Wed Apr  1 12:55:18 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure.in (SIM_AC_OPTION_WARNINGS): Add.
+	configure: Re-generate.
+
+Fri Mar 27 16:15:52 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Wed Mar 25 12:35:29 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Wed Mar 18 12:38:12 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Tue Feb 17 12:38:42 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_store_register, sim_fetch_register): Pass in
+ 	length parameter.  Return -1.
+
+Mon Oct 27 14:43:33 1997  Fred Fish  <fnf@cygnus.com>
+
+	* (dmem_addr): If address is illegal or in I/O space, signal a bus
+ 	error.  Allocate unified memory on demand.  Fix DMEM address
+ 	calculations.
+	
+Mon Feb 16 10:27:53 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_5F20): Implement "dbt".
+	(OP_5F60): Implement "rtd".
+
+	* d10v_sim.h (DPC_CR): Define enum.
+	(DBT_VECTOR_START): Define
+	(DPSW, DPC): Define.
+
+Fri Feb 13 15:15:58 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (move_to_cr): Sync regs[SP_IDX] with State.sp according
+ 	to PSW:SM.
+
+	* d10v_sim.h (struct _state): Add sp, as holding area for SPI/SPU.
+	(SP_IDX): Define.
+
+Wed Feb 11 16:53:49 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_5F00): Call error instead of abort for unknown
+ 	syscalls.
+
+	* d10v_sim.h (enum): Define DPSW_CR.
+
+	* simops.c (move_to_cr): Mask out hardwired zero bits in DPSW.
+
+Tue Feb 10 18:28:38 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_write_phys): Delete.
+	(sim_load): Call sim_load_file with sim_write and LMA.
+
+Mon Feb  9 12:05:01 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c: Rewrite xfer_mem so that it translates addresses as -
+ 	0x00... - DMAP translated memory, 0x01... IMAP translated memory,
+ 	0x10... - on-chip data, 0x11... - on-chip insn, 0x12... - unified
+ 	memory.
+	(pc_addr): Delete.
+	(imem_addr): New function - translate IMEM address.
+	(sim_resume): Use imem_addr to translate insn address, abort if
+ 	translation failed.
+	(sim_create_inferior): Write ARGV to memory using sim_write.  Pass
+ 	argc/argv using r0/r1 not r2/r3.
+	(sim_size): Do not initialize IMAP/DMAP here.
+	(sim_open): Call sim_create_inferior and sim_size to initialize
+ 	the system.
+	(sim_create_inferior): Initialize IMAP/DMAP to hardware reset
+ 	defaults.
+	(init_system): Delete.
+	(xfer_mem, sim_fetch_register, sim_store_register): Do not call
+ 	init_system.
+	(decode_pc): Check prog_bfd is defined before looking up .text
+ 	section.
+
+Sun Feb  1 16:47:51 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Sat Jan 31 18:15:41 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Sun Jan 25 22:23:01 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* interp.c (sim_stop_reason): Exit status is now in r0, not r2.
+
+Sat Jan 24 19:00:30 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* d10v_sim.h (DEBUG_TRAP): New debug flag.
+
+	* simops.c (OP_5F00): If DEBUG_TRAP is on, turn traps 0-14 into
+	printing the registers.
+
+Thu Jan 22 17:54:01 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* simops.c (op_types): New ABI, args are r0..r3, system call # is
+	in r4.
+	(trace_{in,out}put_func): Ditto.
+	(OP_4900): Ditto.
+	(OP_24800000): Ditto.
+	(OP_4D00): Ditto.
+	(OP_5F00): Ditto.
+
+Thu Jan 22 14:30:36 1998  Fred Fish  <fnf@cygnus.com>
+
+	* interp.c (UMEM_SEGMENTS): New define, set to 128.
+	(sim_size): Use UMEM_SEGMENTS rather than hardwired constant.
+	(sim_close): Reset prog_bfd to NULL after closing it.  Also
+	reset prog_bfd_was_opened_p after closing prog_bfd.
+	(sim_load): Reset prog_bfd_was_opened_p after closing prog_bfd.
+	(sim_create_inferior): Get start address from abfd not prog_bfd.
+	(xfer_mem): Do bounds checking on addresses and return zero length
+	read/write on bad addresses, rather than aborting.  Prepare to
+	be able to handle xfers that cross segment boundaries, but not
+	yet implemented.  Only emit debug message when d10v_debug is
+	set as well as DEBUG being defined.
+
+Mon Jan 19 22:26:29 1998  Doug Evans  <devans@seba>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Mon Dec 15 23:17:11 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+	* config.in: Ditto.
+
+Tue Dec  9 10:28:31 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* d10v_sim.h (RPT_S): Index cregs with RPT_S_CR not RPT_E_CR.
+	(BPSW): Ditto for BPSW_CR and not PSW_CR.
+
+	* simops.c (OP_5F40): JMP to BPC instead of assigning PC directly.
+	
+Mon Dec  8 12:58:33 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_5F00): From Martin Hunt <hunt@cygnus.com>. Change
+ 	reserved trap from 0 to 15. Add trap emulation code for 0-14.
+
+	* interp.c (sim_resume): From Martin Hunt <hunt@cygnus.com>. Check
+ 	IBA for SDBT.
+
+	* d10v_sim.h (AE_VECTOR_START, RIE_VECTOR_START,
+ 	SDBT_VECTOR_START, TRAP_VECTOR_START): Define.
+	
+	* simops.c (OP_5F00): For "trap", mask out all but SM bit in PSW,
+ 	use move_to_cr.
+	(OP_5F00): For "trap", update BPSW with move_to_cr.
+
+Fri Dec  5 15:31:17 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* d10v_sim.h (enum): Enumerate CR register names.
+	(enum): Enumerate PSW bit values.
+	(PSW): Obtain value uing move_from_cr.
+	(MOD_S, MOD_E, BPSW): Make r-values.
+	(move_from_cr, move_to_cr): Declare functions.
+	
+	* interp.c (sim_fetch_register, sim_store_register): Use
+ 	move_from_cr and move_to_cr for CR register transfers.
+
+	* simops.c (move_from_cr, move_to_cr): New functions.
+	(OP_5F40): Move BPSW to PSW using move_to_cr and move_from_cr.
+	(OP_5600): For "mvtc", use function move_to_cr.
+	(OP_5200): For "mvfc", use function move_from_cr.
+
+Fri Dec  5 13:33:14 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_5600): For "mvtc" MOD_E and MOD_S, ensure that the
+ 	LSbit is zero.
+
+Thu Dec  4 09:21:05 1997  Doug Evans  <devans@canuck.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Thu Dec  4 16:51:02 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* d10v_sim.h (struct _state): Add DM - PSW debug mask.
+
+	* simops.c (OP_5600): For "mvtc", save PSW.DM.
+	(OP_5200): Ditto for "mvfc".
+
+Wed Dec  3 17:27:06 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* d10v_sim.h (SEXT56): Define.
+
+	* simops.c (OP_4201): For "rac", sign extend 56 bit value before
+ 	it is shifted.
+
+	* d10v_sim.h (MAX32, MIN32, MASK32, MASK40): Re-define using
+ 	SIGNED64 macro.
+
+Tue Dec  2 15:38:34 1997  Fred Fish  <fnf@cygnus.com>
+
+	* interp.c (sim_resume): Call do_2_short with LEFT_FIRST or
+	RIGHT_FIRST, as appropriate, instead of hardcoded ints that
+	don't match enum values.
+
+Tue Dec  2 15:01:08 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_3A00): For "macu", perform multiply stage using 32
+ 	bit rather than 16 bit precision.
+	(OP_3C00): For "mulxu", store unsigned product in ACC.
+	(OP_3800): For "msbu", subtract unsigned product from ACC,
+	(OP_0): For "sub", compute carry by comparing inputs.
+
+Tue Dec  2 11:04:37 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_1000): For "sub2w", compute carry by comparing
+ 	inputs.
+
+Mon Nov 17 20:57:21 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_1): Use 32 bit unsigned arithmetic for subtract,
+ 	carry indicated by value > 0xffff.
+
+Fri Nov 14 12:51:20 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_resume): Don't set up SIGINT handler using signal,
+ 	handled by client.
+	(sim_resume): Fix race condition of a direct assignment to
+ 	stop_simulator, conditionally call sim_stop.
+	(sim_stop_reason): Check stop_simulator returning SIGINT.  Clear
+ 	stop_simulator ready for next sim_resume call.
+	(sim_ctrl_c): Delete function.
+
+Thu Nov 13 19:29:34 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_resume): For "REP", only check/update the PC when
+ 	a branch instruction has not been executed.
+
+Mon Nov 10 17:50:18 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_4201): "rachi". Sign extend bit 40 of ACC.  Sign
+ 	extend bit 44 all constants.
+	(OP_4201): Replace GCC specific 0x..LL with SIGNED64 macro.
+	
+Fri Oct 24 10:26:29 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* d10v_sim.h: Include sim-types.h.
+	(uint8, in816, uiny16, int32, uint32, int64, uint64): Typedef
+ 	using unsigned8 et.al. from sim-types.h.
+	(SEXT32, SEXT40, SEXT44, SEXT60): Replace GCC specific 0x..LL with
+ 	SIGNED64 macro.
+
+Wed Oct 22 14:43:00 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_write_phys): New function, write to physical
+ 	instead of virtual memory.
+	
+	* interp.c (sim_load): Pass lma_p and sim_write_phys to
+ 	sim_load_file.
+
+Mon Oct 13 10:55:07 1997  Fred Fish  <cygnus.com>
+
+	* simops.c (OP_6A01): Change OP_POSTDEC to OP_POSTINC and move
+	exception generation code to OP_6E01.
+	(OP_6E01): Change OP_POSTINC to OP_POSTDEC and insert exception
+	generation code.
+
+Sat Oct 11 09:02:08 1997  Fred Fish  <fnf@cygnus.com>
+
+	* simops.c (OP_6401): postdecrement on r15 is OK, remove exception.
+	(OP_6601): Ditto.
+
+Fri Oct  3 09:28:00 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Sat Sep 27 12:51:34 1997  Fred Fish  <fnf@cygnus.com>
+
+	* interp.c (pc_addr): Discard upper bit(s) of PC in case
+	IMAP1 selects unified memory.
+	* d10v_sim.h (INC_ADDR): Align MOD_E to increment before testing
+	for end condition.
+
+Wed Sep 24 17:38:57 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Tue Sep 23 11:04:38 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Mon Sep 22 11:46:20 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Fri Sep 19 17:45:25 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Mon Sep 15 17:36:15 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Wed Sep 10 22:30:24 1997  Martin M. Hunt  <hunt@cygnus.com>
+
+	* interp.c (sim_resume): Increment PC at end of rep
+	loop.
+
+	* simops.c (OP_4201): Fix rachi instruction.
+
+Thu Sep  4 17:21:23 1997  Doug Evans  <dje@seba>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Wed Aug 27 18:13:22 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+	* config.in: Ditto.
+
+Tue Aug 26 10:37:49 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_kill): Delete.
+	(sim_create_inferior): Add ABFD argument.
+	(sim_load): Move setting of PC from here.
+	(sim_create_inferior): To here.
+	(start_address): Delete variable.
+
+Mon Aug 25 17:50:22 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+	* config.in: Ditto.
+
+Mon Aug 25 15:39:29 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_open): Add ABFD argument.
+
+Tue May 20 10:14:45 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_open): Add callback argument.
+	(sim_set_callbacks): Remove SIM_DESC argument.
+
+Thu Apr 24 00:39:51 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Tue Apr 22 10:29:23 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* interp.c (sim_open): Undo patch to add -E support.
+
+Fri Apr 18 13:39:01 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* interp.c (sim_stop): New function.
+
+Thu Apr 17 02:42:00 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (SIM_OBJS): Add sim-load.o.
+	* d10v_sim.h (exec_bfd): Rename to prog_bfd.
+	* interp.c: #include bfd.h.
+	(myname, sim_kind, start_address): New static locals.
+	(prog_bfd_was_opened_p, prog_bfd): New static locals.
+	(decode_pc): Update to use prog_bfd.
+	(sim_open): Set sim_kind, myname.  Ignore -E arg.
+	(sim_close): Close prog_bfd if simulator opened it.
+	(sim_create_inferior): Return SIM_RC.  Delete arg start_address.
+	(sim_load): Return SIM_RC.  New arg abfd.  Set start address from bfd.
+	Call sim_load_file to load file into simulator.
+	* simops.c (trace_input_func): exec_bfd renamed to prog_bfd.
+
+Wed Apr 16 16:12:03 1997  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* simops.c (OP_5F00): Only provide system calls SYS_execv,
+ 	SYS_wait, SYS_wait, SYS_utime, SYS_time if defined by the host.
+	
+Mon Apr  7 15:45:02 1997  Andrew Cagney  <cagney@kremvax.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+	* config.in: Ditto.
+
+Wed Apr  2 15:06:28 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* interp.c (sim_open): New arg `kind'.
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Wed Apr  2 14:34:19 1997 Andrew Cagney <cagney@kremvax.cygnus.com>
+
+	* configure: Regenerated to track ../common/aclocal.m4 changes.
+
+Mon Mar 17 15:10:07 1997  Andrew Cagney  <cagney@kremvax.cygnus.com>
+
+	* configure: Re-generate.
+
+Fri Mar 14 10:34:11 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure: Regenerate to track ../common/aclocal.m4 changes.
+
+	* simops.c (OP_5F00): Remove old traps 1-3.  Make trap 15 the same
+	as trap 0, which will be deprecated.  Only set errno, if an error
+	in fact was returned.
+
+Thu Mar 13 12:41:20 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* interp.c: Delete redundant prototypes of sim_foo fns.
+	(sim_open): New SIM_DESC result.  Argument is now in argv form.
+	(other sim_*): New SIM_DESC argument.
+
+Thu Mar 13 10:29:04 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* simops.c (trace_{input,output}_func): Call flush_stdout from the
+	callback functions.
+	(OP_5F00): Ditto.
+	(OP_6{4,6,C,A}01): Test for post decrement on the stack pointer.
+	(OP_{1200,1000000,201,5FE0,1003,17001002}): Fix problems in
+	setting the carry bit after an add or a subtract.
+
+Wed Feb 12 16:04:15 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* simops.c (OP_{1403,15002A02,3{0,4}0{0,1}}): Only use the bottom
+	40 bits of accumulators.  Sign/zero extend as appropriate.
+
+Tue Feb  4 13:33:30 1997  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (@COMMON_MAKEFILE_FRAG): Use
+	COMMON_{PRE,POST}_CONFIG_FRAG instead.
+	* configure.in: sinclude ../common/aclocal.m4.
+	* configure: Regenerated.
+
+Thu Jan 23 11:46:23 1997  Stu Grossman  (grossman@critters.cygnus.com)
+
+	* configure configure.in Makefile.in:  Update to new configure
+	scheme which is more compatible with WinGDB builds.
+	* configure.in:  Improve comment on how to run autoconf.
+	* configure:  Re-run autoconf to get new ../common/aclocal.m4.
+	* Makefile.in:  Use autoconf substitution to install common
+	makefile fragment.
+
+Fri Dec 27 22:54:05 1996  Angela Marie Thomas (angela@cygnus.com)
+
+	* gencode.c: patch to not #include "d10v_sim.h" which
+	unecessarily includes bfd.h and causes wingdb configure
+	to fail.
+
+Mon Dec 16 13:39:03 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* interp.c (xfer_mem): Change unified memory to 0x0.
+
+Thu Nov 28 20:42:56 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (OP_3E01): Fix tracing information.
+	(OP_300{0,1}): Do not propigate sign.
+
+Mon Nov 25 19:47:40 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* config.in (WORDS_BIGENDIAN): Add.
+	* configure: Regenerated.
+	* d10v_sim.h: #include "config.h"
+
+Sat Nov 23 09:34:50 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* gencode.c (write_opcodes): Eliminate warnings when generated
+	table.c is compiled.
+
+Wed Nov 20 19:41:40 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* interp.c (sim_open): Cast result of calloc, and make sure NULL
+	was not returned.
+	(dmem_addr): If address is illegal or in I/O space, signal a bus
+	error.
+	(pc_addr): Signal bus error, not illegal instruction for bogus
+	pc.
+
+Wed Nov 20 01:23:03 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in: Delete all stuff moved to ../common/Make-common.in.
+	(SIM_OBJS,SIM_EXTRA_CFLAGS,SIM_EXTRA_CLEAN): Define.
+	* configure.in: Simplify using macros in ../common/aclocal.m4.
+	Call AC_CHECK_HEADERS(unistd.h).
+	* configure: Regenerated.
+	* config.in: New file.
+	* interp.c: #include "callback.h".
+	* simops.c: #include "config.h".  #include <unistd.h> if present.
+
+Fri Nov  8 16:19:55 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* d10v-sim.h (simops): Add flag is_long.
+	(State): Add pc_changed.  Instructions which update the PC should
+	use the JMP macro which sets this.
+	(JMP): New macro.  Sets the PC and the pc_changed flag.
+
+	* gencode.c (write_opcodes): Add is_long field.
+	
+	* interp.c (lookup_hash): If we blindly apply a short opcode's mask
+	to a long opcode we could get a false match.  Check the opcode size.
+	(hash): Add a size field to the hash table.
+	(sim_open): Initialize size field in hash table.
+	(sim_resume): Change to logic for setting the PC.  Used to increment the
+	PC if it had not been changed.  This didn't allow single-instruction loops.
+	Now checks the flag State.pc_changed.  Also now stops when ^C is received.
+	(dmem_addr): Fix translation of data segments to unified memory.
+	(sim_ctrl_c): New function.  When ^C is received, set stop_simulator flag.
+
+	* simops.c: Changed all branch and jump instructions to use new JMP macro.
+	(OP_20000000): Corrected trace information to show this is a ldi.l, not
+	a ldi.s instruction.
+	
+Thu Oct 31 19:13:55 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* interp.c (sim_fetch_register, sim_store_register): Fix bug where
+	updating the accumulators was overwriting other parts of the global
+	State variable.
+
+Wed Oct 30 17:35:14 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* interp.c (bfd.h) Don't include it here any more.
+	(text{,_start,_end}): Move here from simops.c and make extern.
+	(decode_pc): New function to return the PC as an address that the
+	debugger can use.
+	(dmem_addr): Print decoded PC in error message.
+	(pc_addr): Ditto.
+
+	* simops.c (bfd.h) Don't include it here any more.
+	(text{,_start,_end}): Move to simops.c.
+	(trace_input_func): Move decoding of PC, and looking up .text
+	start to decode_pc.
+
+	* d10v_sim.h (bfd.h): Include it here.
+	(text{,_start,_end}): Add external declarations.
+	(exec_bfd): Ditto.
+	(decode_pc): Ditto.
+
+Tue Oct 29 12:13:52 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* interp.c (sim_size): Now allocates unified memory for imap segments
+	0,1,2, and 127. Initializes imap0 and imap1 to 0x1000.  Initializes dmap to 0.
+	(sim_write): Just call xfer_mem().
+	(sim_read): Just call xfer_mem().
+	(xfer_mem): New function. Does appropriate memory mapping and copies bytes.
+	(dmem_addr): New function. Reads dmap register and translates data
+ 	addresses to local addresses.
+	(pc_addr): New function. Reads imap register and computes local address
+	corresponding to contents of the PC.
+	(sim_resume): Change to use pc_addr().
+	(sim_create_inferior): Change reinitialization code. Also reinitializes
+	imap[01] and dmap.
+	(sim_fetch_register): Add fake registers 32,33,34 for imap0, imap1, and dmap.
+	(sim_store_register): Add fake registers 32,33,34 for imap0, imap1, and dmap.
+
+	* simops.c (MEMPTR): Redefine to use dmem_addr().
+	(OP_5F00): Replace references to STate.imem with dmem_addr().
+	
+	* d10v-sim.h (State): Remove mem_min and mem_max. Add umem[128].
+	(RB,SW,RW,SLW,RLW): Redefine to use dmem_addr().
+	(IMAP0,IMAP1,DMAP,SET_IMAP,SET_IMAP1,SET_DMAP): Define.
+	
+Tue Oct 22 15:22:33 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* d10v_sim.h (_ins_type): Reorganize, so that we can provide
+	better statistics, like not counting NOPS as parallel
+	instructions, and printing total cycles.
+	(ins_type_counters): Make unsigned long.
+	(left_nops,right_nops): Fold into ins_type_counters.
+
+	* simops.c (trace_input_func): Print new instruction types.
+	Handle OP_R2R3 as input types.
+	(OP_{38000000,7000}): Correctly sign extend bytes.
+	(OP_5E00): Don't count NOPs as parallel instructions.
+	(OP_460B): Remove unused variable.
+	(OP_5F00): Ditto.
+
+	* interp.c (ins_type_counters): Make unsigned long.
+	(left_nops,right_nops): Delete.
+	(most functions): Add prototypes.
+	(INLINE): If GCC and optimize define as __inline__.
+	({,lookup_}hash,get_operands): Declare as INLINE.
+	(do_parallel): Count conditional operations.
+	(add_commas): New function, to add commas every 3 digits.
+	(sim_size): Call add_commas to print numbers.
+	(sim_{open,resume}): Delete unused variables.
+	(sim_info): Provide better statistics.
+	(sim_read): Add int return type.
+
+Mon Oct 21 16:16:26 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* interp.c (sim_resume): Change the way single-stepping and exceptions
+ 	are handled so single-stepping works again.
+
+Thu Oct 17 12:24:16 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* endian.c: Optimize simulated loads/stores on x86, AIX, and big
+	endian hosts.
+
+	* configure.in (--enable-sim-bswap): New switch to enable using
+	the BSWAP instruction on x86's.
+	* configure: Regenerate.
+
+	* Makefile.in ({SWAP,CONFIG}_CFLAGS): Add --enable-sim-bswap
+	support.
+
+Wed Oct 16 13:50:06 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* endian.c: New file.  Move endian functions here from interp.c.
+	Optimize code, and make it work as either inline functions or as a
+	separate file.
+
+	* interp.c: Move endian functions from here to endian.c.
+
+	* Makefile.in (INCLUDE): Add endian.c.
+	(run,libsim.a): Add dependency on endian.o.
+	(endian.o): Add dependency.
+
+	* d10v_sim.h (read/write support): Always go through the machine
+	independent endian functions.  If compiling with GCC and
+	optimizing, include endian.c so the endian functions are inlined.
+
+	* simops.c (OP_5F00): Correct tracing of accumulators.	
+
+Tue Oct 15 10:57:50 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (OP_5F00): Add support for getpid, kill system calls.
+
+	* interp.c (do_{2_short,parallel}): If an exception is raised,
+	don't execute the second instruction.
+
+Sat Oct 12 22:17:43 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (OP_{31000000,6601,6201,6200}): Store address in a
+	temporary in case the register is overriden when loading.
+	(OP_6200): Output type is OP_DREG for tracing.
+
+Fri Oct  4 23:46:18 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* d10v_sim.h (struct _state): Add mem_{min,max} fields.
+
+	* interp.c (sim_size): Initialize mem_{min,max} fields.
+	(sim_write): Update mem_{min,max} fields.
+	(sim_resume): If PC is not in the minimum/maximum memory range,
+	abort.
+	(sim_create_inferior): Preserve mem_{min,max} fields.
+
+Fri Sep 27 13:11:58 1996  Mark Alexander  <marka@cygnus.com>
+
+	* simops.c (OP_5F00): Add support for time() system call.
+
+Wed Sep 25 16:31:41 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (OP_{6E01,6A01,6E1F,6A00}): Print both words being
+	stored if tracing.
+	(OP_5F00,trace_{in,out}put_func): Add finer grain tracing for
+	system calls.
+
+Mon Sep 23 17:55:30 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (op_types): Add OP_{CONSTANT8,R2,R3}.
+	(trace_input_func): Add support for  OP_{CONSTANT8,R2,R3}.
+	(OP_{4900,24800000,4800,4A00,4B00,4D00,4C00}): Add OP_R2 and OP_R3
+	to call/subroutine returns to trace the first two arguments and
+	the return value.  For small jumps, use CONSTANT8, not CONSTANT16.
+
+Fri Sep 20 15:36:45 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* interp.c (sim_create_inferior): Reinitialize State every time 
+	sim_create_inferior() is called.
+
+Thu Sep 19 21:38:20 1996  Michael Meissner  <meissner@wogglebug.ziplink.net>
+
+	* simops.c (OP_{401,2000000,601,3000000,23000000}): Get sign right
+	on comparisons.
+	(OP_401): Fix tracing information.
+
+Thu Sep 19 10:30:22 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (SIZE_{PC,LINE_NUMBER}): New default sizes for output.
+	(trace_input_func): Use them.
+	(trace_input_func): Make sure there is a trailing space after the
+	instruction.
+	(OP_6200): Fix tracing info.
+
+	* Makefile.in (run): Add dependencies on libbfd.a and
+	libiberity.a.
+
+Wed Sep 18 09:13:25 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* d10v_sim.h (DEBUG_INSTRUCTION): New debug value to include line
+	numbers and function names in debug trace.
+	(DEBUG): If not defined, set to DEBUG_TRACE, DEBUG_VALUES, and
+	DEBUG_LINE_NUMBER. 
+	(SIG_D10V_{STOP,EXIT}): Values to represent the stop instruction
+	and exit system call trap being executed.
+
+	* interp.c (sim_stop_reason): Set exit code correctly for stop
+	instruction and exit system call trap.
+
+	* configure.in (--enable-sim-cflags): Remove trace case.
+	(--enable-sim-debug): New switch to set the debug values.
+	* configure: Regenerate.
+
+	* simops.c (trace_{input,output}_func): Rename from
+	trace_{input,output}.
+	(trace_{input,output}): Call trace_{input,output}_func if
+	d10v_debug is non-zero.
+	(SIZE_INSTRUCTION): Cut down to 8.
+	(SIZE_OPERANDS): Cut down to 18.
+	(SIZE_LOCATION): New value for size of line number, function name
+	field.
+	(init_text_p,text{,_start,_end}): New static variables for
+	printing line number and function name.
+	(exec_bfd): New external that run.c sets.
+	(trace_input_func): Print line number and function name if
+	available and if desired.
+	(OP_4E09): Don't print out DBT message.
+	(OP_5FE0): Set exception field to SIG_D10V_STOP.
+	(OP_5F00): Set exception field to SIG_D10V_EXIT.	
+
+Sat Sep 14 22:18:43 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* interp.c (do_2_short): If the instruction encodes jump->ins,
+	don't do the second instruction if the jump succeeds.
+
+Fri Sep 13 22:35:19 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (OP_5F00): Use unknown traps to print all GPRs,
+	accumulators, PC, and F0/F1/C flags.
+
+Thu Sep 12 12:50:11 1996  Mark Alexander  <marka@cygnus.com>
+
+	* simops.c (OP_5F00): Fix problems with system calls.
+
+Thu Sep 12 12:19:28 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (OP_5F00): Correct tracing information for trap.
+
+Wed Sep 11 18:55:50 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* Makefile.in (CSEARCH): Correctly find opcodes directory.
+
+Mon Sep  9 13:27:26 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (trace_output): Properly align accumulator output.
+	(OP_3{0,2,4}00): Properly parenthesize test expression.  Add error
+	if shift count is too high.
+	(OP_4E{00,02,04,20,22,40,42}): Make tests agree with book.
+	(OP_4E09): Make cpfg properly trace the input flags.
+	(op_types): Add OP_FLAG_OUTPUT.
+	(trace_{input,output}): Support OP_FLAG_OUTPUT.
+	(OP_31000000): This ld2w varient is a 16-bit memory reference, not
+	an 8-bit memory reference instruction for tracing purposes.
+	(OP_201): Addi needs to set the carry.
+
+Fri Sep  6 17:56:17 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* simops.c (OP_2600, OP_2601): Changed min and max comparisons
+	to use signed register values.
+
+Wed Sep  4 11:35:17 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* d10v_sim.h (DEBUG_*): Add bit flags for controlling debug
+	output.
+	(_ins_type): New enumeration to specify which container an
+	instruction is in, and whether it is part of a parallel operation.
+	(_state): Add ins_type field.
+	({,u}int{8,16,32,64}): Use limits.h to size the appropriate types.
+	(ins_type_counters): Counters for the various instruction types.
+	({left,right}_nops): Counters for the number of nops in each
+	container.
+	(d10v_debug): New variable to indicate whether debugging is turned
+	on.
+
+	* simops.c: (all functions): Change all #ifdef DEBUG code so that
+	the input and output values can be traced, along with the
+	instruction type.  Make the -t option enable tracing.
+	(all functions): Change printf calls to use the printf_filtered
+	function in the callback table.
+
+	* interp.c (_leftright): New enumeration to say whether 2 short
+	instructions are done left first or right first.
+	(do_{long,2_short,parallel}): Indicate in the machine state which
+	type of instruction this is.  Count each of the types of
+	instructions executed.
+	(sim_size): Only print the memory sizes if DEBUG_MEMSIZE debug
+	flag is set.
+	(sim_resume): Pass left/right indication to do_2_short.
+	(all functions): Change printf calls to use the printf_filtered
+	function in the callback table.
+	(sim_trace): Turn on debug flag if DEBUG was defined, and call
+	sim_resume.
+	(sim_info): Print out statistics on instructions.
+	(sim_{trace,create_inferior}): Eliminate extraneous output unless
+	debugging.
+	(sim_open): If args == -t and DEBUG was defined, set d10v_debug.
+	Only initialize the hash table the first time sim_open is called.
+
+	* Makefile.in: Make objects depend on d10v_sim.h.
+	({,SIM_}CFLAGS): Include configure dependent switches.  Setting
+	CFLAGS does not override host/target defines or SIM_CFLAGS.
+	(CC_FOR_BUILD,gencode): Use CC_FOR_BUILD to compile gencode.
+	(run): By default, the math library is not needed to be linked
+	in.
+	({BFD,LIBIBERTY}_LIB): Define as variables so they can be
+	overridden.
+	(VPATH): Don't set to anything but @srcdir@ to work with non-GNU
+	makes.
+	({run,callback}.o): Provide explicit paths to their appropriate
+	source directories.
+	(gencode{,.o},d10v-opc.o): Split compilation into creating object
+	and linking.  Instead of linking in libopcodes.a, just compile
+	d10v-opc.o directly to handle canadian cross.
+	(CSEARCH): Add opcodes directory.
+
+	* configure.in (--enable-sim-cflags): New switch to allow user to
+	set the defaults.
+	(CC_FOR_BUILD): Deal with canadian crosses.
+	* configure: Regenerate.
+
+Wed Sep 04 04:45:34 1996  Mark Alexander  <marka@cygnus.com>
+
+	* simops.c: Include correct syscall.h for d10v, not host's.
+	Fix #ifdef SYS_stat.
+
+Tue Sep  3 14:00:04 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+	* simops.c (OP_5F00): Wrap all SYS_xxx traps with #ifdef.
+	Add trap 2 to be printf and trap 3 to be putchar.
+
+Wed Aug 28 21:42:34 1996  Mark Alexander  <marka@cygnus.com>
+
+	* Makefile.in, d10v_sim.h, interp.c, simops.c: Add support
+	for low-level system calls.
+
+Wed Aug 28 17:33:19 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* Makefile.in, d10v_sim.h, interp.c: Fix byte-order problems.
+
+Mon Aug 26 18:30:28 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* d10v_sim.h (SEXT32): Added.
+	* interp.c: Commented out printfs.
+	* simops.c:  Fixed error in sb and st2w. 
+
+Thu Aug 15 13:30:03 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* Makefile.in, d10v_sim.h, interp.c, simops.c: Added remaining
+	DSP instructions.  Added modulo addressing.
+
+Sun Aug 11 12:57:15 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* Makefile.in, d10v_sim.h, interp.c, simops.c: Snapshot.
+
+Fri Aug  2 17:44:24 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* d10v_sim.h, simops.c: Snapshot.
+
+Thu Aug  1 17:05:24 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
+
+	* ChangeLog, Makefile.in, configure, configure.in, d10v_sim.h, 
+	gencode.c, interp.c, simops.c: Created.
+
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
new file mode 100644
index 0000000..0732327
--- /dev/null
+++ b/sim/d10v/Makefile.in
@@ -0,0 +1,52 @@
+#    Makefile template for Configure for the D10v sim library.
+#    Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+#    Written by Cygnus Support.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+## COMMON_PRE_CONFIG_FRAG
+
+SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o
+SIM_EXTRA_CLEAN = clean-extra
+
+INCLUDE = d10v_sim.h $(srcroot)/include/callback.h targ-vals.h endian.c
+
+# This selects the d10v newlib/libgloss syscall definitions.
+NL_TARGET = -DNL_TARGET_d10v
+
+## COMMON_POST_CONFIG_FRAG
+
+simops.h: gencode
+	./gencode -h >$@
+
+table.c: gencode simops.h
+	./gencode >$@
+
+gencode.o: gencode.c $(INCLUDE)
+	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/gencode.c
+
+d10v-opc.o: $(srcdir)/../../opcodes/d10v-opc.c
+	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -c $(srcdir)/../../opcodes/d10v-opc.c
+
+gencode: gencode.o d10v-opc.o
+	$(CC_FOR_BUILD) $(BUILD_CFLAGS) -o gencode gencode.o d10v-opc.o $(BUILD_LIB)
+
+clean-extra:
+	rm -f table.c simops.h gencode
+
+interp.o: interp.c table.c $(INCLUDE)
+simops.o: simops.c $(INCLUDE)
+endian.o: endian.c $(INCLUDE)
+table.o: table.c
diff --git a/sim/d10v/acconfig.h b/sim/d10v/acconfig.h
new file mode 100644
index 0000000..f9b87a1
--- /dev/null
+++ b/sim/d10v/acconfig.h
@@ -0,0 +1,15 @@
+
+/* Define to 1 if NLS is requested.  */
+#undef ENABLE_NLS
+
+/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
+#undef HAVE_CATGETS
+
+/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
+#undef HAVE_GETTEXT
+
+/* Define as 1 if you have the stpcpy function.  */
+#undef HAVE_STPCPY
+
+/* Define if your locale.h file contains LC_MESSAGES.  */
+#undef HAVE_LC_MESSAGES
diff --git a/sim/d10v/config.in b/sim/d10v/config.in
new file mode 100644
index 0000000..1f87a2b
--- /dev/null
+++ b/sim/d10v/config.in
@@ -0,0 +1,158 @@
+/* config.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
+
+/* Define to empty if the keyword does not work.  */
+#undef const
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+#undef CRAY_STACKSEG_END
+
+/* Define if you have alloca, as a function or macro.  */
+#undef HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+#undef HAVE_ALLOCA_H
+
+/* Define if you have a working `mmap' system call.  */
+#undef HAVE_MMAP
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+#undef off_t
+
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
+/* Define as the return type of signal handlers (int or void).  */
+#undef RETSIGTYPE
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define to 1 if NLS is requested.  */
+#undef ENABLE_NLS
+
+/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
+#undef HAVE_GETTEXT
+
+/* Define as 1 if you have the stpcpy function.  */
+#undef HAVE_STPCPY
+
+/* Define if your locale.h file contains LC_MESSAGES.  */
+#undef HAVE_LC_MESSAGES
+
+/* Define if you have the __argz_count function.  */
+#undef HAVE___ARGZ_COUNT
+
+/* Define if you have the __argz_next function.  */
+#undef HAVE___ARGZ_NEXT
+
+/* Define if you have the __argz_stringify function.  */
+#undef HAVE___ARGZ_STRINGIFY
+
+/* Define if you have the __setfpucw function.  */
+#undef HAVE___SETFPUCW
+
+/* Define if you have the dcgettext function.  */
+#undef HAVE_DCGETTEXT
+
+/* Define if you have the getcwd function.  */
+#undef HAVE_GETCWD
+
+/* Define if you have the getpagesize function.  */
+#undef HAVE_GETPAGESIZE
+
+/* Define if you have the getrusage function.  */
+#undef HAVE_GETRUSAGE
+
+/* Define if you have the munmap function.  */
+#undef HAVE_MUNMAP
+
+/* Define if you have the putenv function.  */
+#undef HAVE_PUTENV
+
+/* Define if you have the setenv function.  */
+#undef HAVE_SETENV
+
+/* Define if you have the setlocale function.  */
+#undef HAVE_SETLOCALE
+
+/* Define if you have the sigaction function.  */
+#undef HAVE_SIGACTION
+
+/* Define if you have the stpcpy function.  */
+#undef HAVE_STPCPY
+
+/* Define if you have the strcasecmp function.  */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the strchr function.  */
+#undef HAVE_STRCHR
+
+/* Define if you have the time function.  */
+#undef HAVE_TIME
+
+/* Define if you have the <argz.h> header file.  */
+#undef HAVE_ARGZ_H
+
+/* Define if you have the <fcntl.h> header file.  */
+#undef HAVE_FCNTL_H
+
+/* Define if you have the <fpu_control.h> header file.  */
+#undef HAVE_FPU_CONTROL_H
+
+/* Define if you have the <limits.h> header file.  */
+#undef HAVE_LIMITS_H
+
+/* Define if you have the <locale.h> header file.  */
+#undef HAVE_LOCALE_H
+
+/* Define if you have the <malloc.h> header file.  */
+#undef HAVE_MALLOC_H
+
+/* Define if you have the <nl_types.h> header file.  */
+#undef HAVE_NL_TYPES_H
+
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
+
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
+
+/* Define if you have the <sys/param.h> header file.  */
+#undef HAVE_SYS_PARAM_H
+
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
+
+/* Define if you have the <sys/time.h> header file.  */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <time.h> header file.  */
+#undef HAVE_TIME_H
+
+/* Define if you have the <unistd.h> header file.  */
+#undef HAVE_UNISTD_H
+
+/* Define if you have the <values.h> header file.  */
+#undef HAVE_VALUES_H
diff --git a/sim/d10v/configure b/sim/d10v/configure
new file mode 100755
index 0000000..c3b96cf
--- /dev/null
+++ b/sim/d10v/configure
@@ -0,0 +1,3917 @@
+#! /bin/sh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+sim_inline="-DDEFAULT_INLINE=0"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# This file is derived from `gettext.m4'.  The difference is that the
+# included macros assume Cygnus-style source and build trees.
+
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file file be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 3
+
+
+
+
+
+# Search path for a program which passes the given test.
+# Ulrich Drepper <drepper@cygnus.com>, 1996.
+#
+# This file file be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+
+
+# Check whether LC_MESSAGES is available in <locale.h>.
+# Ulrich Drepper <drepper@cygnus.com>, 1995.
+#
+# This file file be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+
+# serial 1
+
+
+
+# Check to see if we're running under Cygwin32, without using
+# AC_CANONICAL_*.  If so, set output variable CYGWIN32 to "yes".
+# Otherwise set it to "no".
+
+
+
+# Check to see if we're running under Win32, without using
+# AC_CANONICAL_*.  If so, set output variable EXEEXT to ".exe".
+# Otherwise set it to "".
+
+
+
+
+# Guess values for system-dependent variables and create Makefiles.
+# Generated automatically using autoconf version 2.12.2 
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+# Defaults:
+ac_help=
+ac_default_prefix=/usr/local
+# Any additions from configure.in:
+ac_help="$ac_help
+  --disable-nls           do not use Native Language Support"
+ac_help="$ac_help
+  --with-included-gettext use the GNU gettext library included here"
+ac_help="$ac_help
+  --enable-maintainer-mode		Enable developer functionality."
+ac_help="$ac_help
+  --enable-sim-bswap			Use Host specific BSWAP instruction."
+ac_help="$ac_help
+  --enable-sim-cflags=opts		Extra CFLAGS for use in building simulator"
+ac_help="$ac_help
+  --enable-sim-debug=opts		Enable debugging flags"
+ac_help="$ac_help
+  --enable-sim-stdio			Specify whether to use stdio for console input/output."
+ac_help="$ac_help
+  --enable-sim-trace=opts		Enable tracing flags"
+ac_help="$ac_help
+  --enable-sim-profile=opts		Enable profiling flags"
+ac_help="$ac_help
+  --enable-build-warnings[=LIST]		Enable build-time compiler warnings"
+
+# Initialize some variables set by options.
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+build=NONE
+cache_file=./config.cache
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+# Initialize some other variables.
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
+
+ac_prev=
+for ac_option
+do
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval "$ac_prev=\$ac_option"
+    ac_prev=
+    continue
+  fi
+
+  case "$ac_option" in
+  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) ac_optarg= ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case "$ac_option" in
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir="$ac_optarg" ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build="$ac_optarg" ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file="$ac_optarg" ;;
+
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
+    datadir="$ac_optarg" ;;
+
+  -disable-* | --disable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    eval "enable_${ac_feature}=no" ;;
+
+  -enable-* | --enable-*)
+    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+    fi
+    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "enable_${ac_feature}='$ac_optarg'" ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix="$ac_optarg" ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he)
+    # Omit some internal or obsolete options to make the list less imposing.
+    # This message is too long to be a string in the A/UX 3.1 sh.
+    cat << EOF
+Usage: configure [options] [host]
+Options: [defaults in brackets after descriptions]
+Configuration:
+  --cache-file=FILE       cache test results in FILE
+  --help                  print this message
+  --no-create             do not create output files
+  --quiet, --silent       do not print \`checking...' messages
+  --version               print the version of autoconf that created configure
+Directory and file names:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [same as prefix]
+  --bindir=DIR            user executables in DIR [EPREFIX/bin]
+  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
+  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
+  --datadir=DIR           read-only architecture-independent data in DIR
+                          [PREFIX/share]
+  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
+                          [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
+  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
+  --includedir=DIR        C header files in DIR [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
+  --infodir=DIR           info documentation in DIR [PREFIX/info]
+  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --srcdir=DIR            find the sources in DIR [configure dir or ..]
+  --program-prefix=PREFIX prepend PREFIX to installed program names
+  --program-suffix=SUFFIX append SUFFIX to installed program names
+  --program-transform-name=PROGRAM
+                          run sed PROGRAM on installed program names
+EOF
+    cat << EOF
+Host type:
+  --build=BUILD           configure for building on BUILD [BUILD=HOST]
+  --host=HOST             configure for HOST [guessed]
+  --target=TARGET         configure for TARGET [TARGET=HOST]
+Features and packages:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --x-includes=DIR        X include files are in DIR
+  --x-libraries=DIR       X library files are in DIR
+EOF
+    if test -n "$ac_help"; then
+      echo "--enable and --with options recognized:$ac_help"
+    fi
+    exit 0 ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host="$ac_optarg" ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir="$ac_optarg" ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir="$ac_optarg" ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir="$ac_optarg" ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir="$ac_optarg" ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+    localstatedir="$ac_optarg" ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir="$ac_optarg" ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir="$ac_optarg" ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix="$ac_optarg" ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix="$ac_optarg" ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix="$ac_optarg" ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name="$ac_optarg" ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir="$ac_optarg" ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir="$ac_optarg" ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site="$ac_optarg" ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir="$ac_optarg" ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir="$ac_optarg" ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target="$ac_optarg" ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers)
+    echo "configure generated by autoconf version 2.12.2"
+    exit 0 ;;
+
+  -with-* | --with-*)
+    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case "$ac_option" in
+      *=*) ;;
+      *) ac_optarg=yes ;;
+    esac
+    eval "with_${ac_package}='$ac_optarg'" ;;
+
+  -without-* | --without-*)
+    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    # Reject names that are not valid shell variable names.
+    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+    fi
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    eval "with_${ac_package}=no" ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes="$ac_optarg" ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries="$ac_optarg" ;;
+
+  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+    ;;
+
+  *)
+    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    fi
+    if test "x$nonopt" != xNONE; then
+      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    fi
+    nonopt="$ac_option"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+fi
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo > confdefs.h
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=Makefile.in
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+ac_exeext=
+ac_objext=o
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
+
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:679: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 694 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 711 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 728 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:759: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
+echo "configure:786: checking for POSIXized ISC" >&5
+if test -d /etc/conf/kconfig.d &&
+  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
+then
+  echo "$ac_t""yes" 1>&6
+  ISC=yes # If later tests want to check for ISC.
+  cat >> confdefs.h <<\EOF
+#define _POSIX_SOURCE 1
+EOF
+
+  if test "$GCC" = yes; then
+    CC="$CC -posix"
+  else
+    CC="$CC -Xp"
+  fi
+else
+  echo "$ac_t""no" 1>&6
+  ISC=
+fi
+
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:807: checking for ANSI C header files" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 812 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  ac_cv_header_stdc=yes
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 837 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 855 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+  :
+else
+  cat > conftest.$ac_ext <<EOF
+#line 876 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+
+fi
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:911: checking for working const" >&5
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 916 "configure"
+#include "confdefs.h"
+
+int main() {
+
+/* Ultrix mips cc rejects this.  */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this.  */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this.  */
+struct point {int x, y;};
+static struct point const zero = {0,0};
+/* AIX XL C 1.02.0.0 rejects this.
+   It does not let you subtract one const X* pointer from another in an arm
+   of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this.  */
+  char *t;
+  char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+  *t++ = 0;
+}
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying
+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+  struct s { int j; const int *ap[3]; };
+  struct s *b; b->j = 5;
+}
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  const int foo = 10;
+}
+
+; return 0; }
+EOF
+if { (eval echo configure:965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_const=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 
+EOF
+
+fi
+
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:986: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat > conftest.$ac_ext <<EOF
+#line 993 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:1000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+
+fi
+
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
+  inline | yes) ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
+esac
+
+echo $ac_n "checking for off_t""... $ac_c" 1>&6
+echo "configure:1026: checking for off_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1031 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_off_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_off_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_off_t" 1>&6
+if test $ac_cv_type_off_t = no; then
+  cat >> confdefs.h <<\EOF
+#define off_t long
+EOF
+
+fi
+
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:1059: checking for size_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1064 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_size_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_size_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
+#define size_t unsigned
+EOF
+
+fi
+
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+# for constant arguments.  Useless!
+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "configure:1094: checking for working alloca.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1099 "configure"
+#include "confdefs.h"
+#include <alloca.h>
+int main() {
+char *p = alloca(2 * sizeof(int));
+; return 0; }
+EOF
+if { (eval echo configure:1106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_header_alloca_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_alloca_h=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
+if test $ac_cv_header_alloca_h = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ALLOCA_H 1
+EOF
+
+fi
+
+echo $ac_n "checking for alloca""... $ac_c" 1>&6
+echo "configure:1127: checking for alloca" >&5
+if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1132 "configure"
+#include "confdefs.h"
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  if HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+int main() {
+char *p = (char *) alloca(1);
+; return 0; }
+EOF
+if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_func_alloca_works=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_alloca_works=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
+if test $ac_cv_func_alloca_works = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_ALLOCA 1
+EOF
+
+fi
+
+if test $ac_cv_func_alloca_works = no; then
+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+  # that cause trouble.  Some versions do not even contain alloca or
+  # contain a buggy version.  If you still want to use their alloca,
+  # use ar to extract alloca.o from them instead of compiling alloca.c.
+  ALLOCA=alloca.${ac_objext}
+  cat >> confdefs.h <<\EOF
+#define C_ALLOCA 1
+EOF
+
+
+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo "configure:1192: checking whether alloca needs Cray hooks" >&5
+if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1197 "configure"
+#include "confdefs.h"
+#if defined(CRAY) && ! defined(CRAY2)
+webecray
+#else
+wenotbecray
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "webecray" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_os_cray=yes
+else
+  rm -rf conftest*
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_os_cray" 1>&6
+if test $ac_cv_os_cray = yes; then
+for ac_func in _getb67 GETB67 getb67; do
+  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1222: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1227 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<EOF
+#define CRAY_STACKSEG_END $ac_func
+EOF
+
+  break
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+done
+fi
+
+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "configure:1277: checking stack direction for C alloca" >&5
+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_c_stack_direction=0
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1285 "configure"
+#include "confdefs.h"
+find_stack_direction ()
+{
+  static char *addr = 0;
+  auto char dummy;
+  if (addr == 0)
+    {
+      addr = &dummy;
+      return find_stack_direction ();
+    }
+  else
+    return (&dummy > addr) ? 1 : -1;
+}
+main ()
+{
+  exit (find_stack_direction() < 0);
+}
+EOF
+if { (eval echo configure:1304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_stack_direction=1
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_stack_direction=-1
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
+cat >> confdefs.h <<EOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+EOF
+
+fi
+
+for ac_hdr in unistd.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1329: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1334 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_func in getpagesize
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1368: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1373 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+echo "configure:1421: checking for working mmap" >&5
+if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_mmap_fixed_mapped=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1429 "configure"
+#include "confdefs.h"
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the filesystem buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propogated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+#include <sys/types.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+
+/* Assume that all systems that can run configure have sys/param.h.  */
+# ifndef HAVE_SYS_PARAM_H
+#  define HAVE_SYS_PARAM_H 1
+# endif
+
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+#ifdef __cplusplus
+extern "C" { void *malloc(unsigned); }
+#else
+char *malloc();
+#endif
+
+int
+main()
+{
+	char *data, *data2, *data3;
+	int i, pagesize;
+	int fd;
+
+	pagesize = getpagesize();
+
+	/*
+	 * First, make a file with some known garbage in it.
+	 */
+	data = malloc(pagesize);
+	if (!data)
+		exit(1);
+	for (i = 0; i < pagesize; ++i)
+		*(data + i) = rand();
+	umask(0);
+	fd = creat("conftestmmap", 0600);
+	if (fd < 0)
+		exit(1);
+	if (write(fd, data, pagesize) != pagesize)
+		exit(1);
+	close(fd);
+
+	/*
+	 * Next, try to mmap the file at a fixed address which
+	 * already has something else allocated at it.  If we can,
+	 * also make sure that we see the same garbage.
+	 */
+	fd = open("conftestmmap", O_RDWR);
+	if (fd < 0)
+		exit(1);
+	data2 = malloc(2 * pagesize);
+	if (!data2)
+		exit(1);
+	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
+	if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
+	    MAP_PRIVATE | MAP_FIXED, fd, 0L))
+		exit(1);
+	for (i = 0; i < pagesize; ++i)
+		if (*(data + i) != *(data2 + i))
+			exit(1);
+
+	/*
+	 * Finally, make sure that changes to the mapped area
+	 * do not percolate back to the file as seen by read().
+	 * (This is a bug on some variants of i386 svr4.0.)
+	 */
+	for (i = 0; i < pagesize; ++i)
+		*(data2 + i) = *(data2 + i) + 1;
+	data3 = malloc(pagesize);
+	if (!data3)
+		exit(1);
+	if (read(fd, data3, pagesize) != pagesize)
+		exit(1);
+	for (i = 0; i < pagesize; ++i)
+		if (*(data + i) != *(data3 + i))
+			exit(1);
+	close(fd);
+	unlink("conftestmmap");
+	exit(0);
+}
+
+EOF
+if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_mmap_fixed_mapped=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_mmap_fixed_mapped=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_MMAP 1
+EOF
+
+fi
+
+
+# autoconf.info says this should be called right after AC_INIT.
+
+
+ac_aux_dir=
+for ac_dir in `cd $srcdir;pwd`/../.. $srcdir/`cd $srcdir;pwd`/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in `cd $srcdir;pwd`/../.. $srcdir/`cd $srcdir;pwd`/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+# Do some error checking and defaulting for the host and target type.
+# The inputs are:
+#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
+#
+# The rules are:
+# 1. You are not allowed to specify --host, --target, and nonopt at the
+#    same time.
+# 2. Host defaults to nonopt.
+# 3. If nonopt is not specified, then host defaults to the current host,
+#    as determined by config.guess.
+# 4. Target and build default to nonopt.
+# 5. If nonopt is not specified, then target and build default to host.
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+case $host---$target---$nonopt in
+NONE---*---* | *---NONE---* | *---*---NONE) ;;
+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
+esac
+
+
+# Make sure we can run config.sub.
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:1642: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:1663: checking target system type" >&5
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
+
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
+
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:1681: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+test "$host_alias" != "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1725: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1754: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1804: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:1835: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext <<EOF
+#line 1845 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ac_cv_prog_cc_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cc_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:1869: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:1874: checking whether we are using GNU C" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1902: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:1945: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test "x$cross_compiling" = "xno"; then
+  CC_FOR_BUILD='$(CC)'
+else
+  CC_FOR_BUILD=gcc
+fi
+
+
+
+
+AR=${AR-ar}
+
+# Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2011: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ALL_LINGUAS=
+                              
+   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
+unistd.h values.h sys/param.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2045: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2050 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+   for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
+__argz_count __argz_stringify __argz_next
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2085: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2090 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+   if test "${ac_cv_func_stpcpy+set}" != "set"; then
+     for ac_func in stpcpy
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2142: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2147 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+   fi
+   if test "${ac_cv_func_stpcpy}" = "yes"; then
+     cat >> confdefs.h <<\EOF
+#define HAVE_STPCPY 1
+EOF
+
+   fi
+
+   if test $ac_cv_header_locale_h = yes; then
+    echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
+echo "configure:2204: checking for LC_MESSAGES" >&5
+if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2209 "configure"
+#include "confdefs.h"
+#include <locale.h>
+int main() {
+return LC_MESSAGES
+; return 0; }
+EOF
+if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  am_cv_val_LC_MESSAGES=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  am_cv_val_LC_MESSAGES=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      cat >> confdefs.h <<\EOF
+#define HAVE_LC_MESSAGES 1
+EOF
+
+    fi
+  fi
+   echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
+echo "configure:2237: checking whether NLS is requested" >&5
+        # Check whether --enable-nls or --disable-nls was given.
+if test "${enable_nls+set}" = set; then
+  enableval="$enable_nls"
+  USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+    echo "$ac_t""$USE_NLS" 1>&6
+    
+
+    USE_INCLUDED_LIBINTL=no
+
+        if test "$USE_NLS" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define ENABLE_NLS 1
+EOF
+
+      echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
+echo "configure:2257: checking whether included gettext is requested" >&5
+      # Check whether --with-included-gettext or --without-included-gettext was given.
+if test "${with_included_gettext+set}" = set; then
+  withval="$with_included_gettext"
+  nls_cv_force_use_gnu_gettext=$withval
+else
+  nls_cv_force_use_gnu_gettext=no
+fi
+
+      echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+                        		nls_cv_header_intl=
+	nls_cv_header_libgt=
+	CATOBJEXT=NONE
+
+	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
+echo "configure:2276: checking for libintl.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2281 "configure"
+#include "confdefs.h"
+#include <libintl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
+echo "configure:2303: checking for gettext in libc" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2308 "configure"
+#include "confdefs.h"
+#include <libintl.h>
+int main() {
+return (int) gettext ("")
+; return 0; }
+EOF
+if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  gt_cv_func_gettext_libc=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gt_cv_func_gettext_libc=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
+
+	   if test "$gt_cv_func_gettext_libc" != "yes"; then
+	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
+echo "configure:2331: checking for bindtextdomain in -lintl" >&5
+ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lintl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2339 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char bindtextdomain();
+
+int main() {
+bindtextdomain()
+; return 0; }
+EOF
+if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
+echo "configure:2366: checking for gettext in libintl" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2371 "configure"
+#include "confdefs.h"
+
+int main() {
+return (int) gettext ("")
+; return 0; }
+EOF
+if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  gt_cv_func_gettext_libintl=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gt_cv_func_gettext_libintl=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	   fi
+
+	   if test "$gt_cv_func_gettext_libc" = "yes" \
+	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
+	      cat >> confdefs.h <<\EOF
+#define HAVE_GETTEXT 1
+EOF
+
+	      # Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2406: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$MSGFMT" in
+  /*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+  ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test -n "$MSGFMT"; then
+  echo "$ac_t""$MSGFMT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+	      if test "$MSGFMT" != "no"; then
+		for ac_func in dcgettext
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2440: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2445 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+		# Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2495: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$GMSGFMT" in
+  /*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT="$ac_cv_path_GMSGFMT"
+if test -n "$GMSGFMT"; then
+  echo "$ac_t""$GMSGFMT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+		# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2530: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$XGETTEXT" in
+  /*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test -n "$XGETTEXT"; then
+  echo "$ac_t""$XGETTEXT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+		cat > conftest.$ac_ext <<EOF
+#line 2562 "configure"
+#include "confdefs.h"
+
+int main() {
+extern int _nl_msg_cat_cntr;
+			       return _nl_msg_cat_cntr
+; return 0; }
+EOF
+if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  CATOBJEXT=.gmo
+		   DATADIRNAME=share
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CATOBJEXT=.mo
+		   DATADIRNAME=lib
+fi
+rm -f conftest*
+		INSTOBJEXT=.mo
+	      fi
+	    fi
+	
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+	        
+        if test "$CATOBJEXT" = "NONE"; then
+	  	  	  nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+                INTLOBJS="\$(GETTOBJS)"
+        # Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2602: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$MSGFMT" in
+  /*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
+  ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test -n "$MSGFMT"; then
+  echo "$ac_t""$MSGFMT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+        # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2636: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$GMSGFMT" in
+  /*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT="$ac_cv_path_GMSGFMT"
+if test -n "$GMSGFMT"; then
+  echo "$ac_t""$GMSGFMT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+        # Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2671: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$XGETTEXT" in
+  /*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test -n "$XGETTEXT"; then
+  echo "$ac_t""$XGETTEXT" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+        
+	USE_INCLUDED_LIBINTL=yes
+        CATOBJEXT=.gmo
+        INSTOBJEXT=.mo
+        DATADIRNAME=share
+	INTLDEPS='$(top_builddir)/../intl/libintl.a'
+	INTLLIBS=$INTLDEPS
+	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+        nls_cv_header_intl=libintl.h
+        nls_cv_header_libgt=libgettext.h
+      fi
+
+            if test "$XGETTEXT" != ":"; then
+			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+	  : ;
+	else
+	  echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6
+	  XGETTEXT=":"
+	fi
+      fi
+
+      # We need to process the po/ directory.
+      POSUB=po
+    else
+      DATADIRNAME=share
+      nls_cv_header_intl=libintl.h
+      nls_cv_header_libgt=libgettext.h
+    fi
+
+    # If this is used in GNU gettext we have to set USE_NLS to `yes'
+    # because some of the sources are only built for this goal.
+    if test "$PACKAGE" = gettext; then
+      USE_NLS=yes
+      USE_INCLUDED_LIBINTL=yes
+    fi
+
+                for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+        
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+
+   if test "x$CATOBJEXT" != "x"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+echo "configure:2761: checking for catalogs to be installed" >&5
+       NEW_LINGUAS=
+       for lang in ${LINGUAS=$ALL_LINGUAS}; do
+         case "$ALL_LINGUAS" in
+          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+         esac
+       done
+       LINGUAS=$NEW_LINGUAS
+       echo "$ac_t""$LINGUAS" 1>&6
+     fi
+
+          if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+            if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   
+
+            if test -f $srcdir/po2tbl.sed.in; then
+      if test "$CATOBJEXT" = ".cat"; then
+	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
+echo "configure:2789: checking for linux/version.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2794 "configure"
+#include "confdefs.h"
+#include <linux/version.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  msgformat=linux
+else
+  echo "$ac_t""no" 1>&6
+msgformat=xopen
+fi
+
+
+	          	 sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed
+      fi
+            sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
+	 $srcdir/po2tbl.sed.in > po2tbl.sed
+   fi
+
+            if test "$PACKAGE" = "gettext"; then
+     GT_NO="#NO#"
+     GT_YES=
+   else
+     GT_NO=
+     GT_YES="#YES#"
+   fi
+   
+   
+
+   MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs"
+   
+
+      l=
+   
+
+            if test -d $srcdir/po; then
+      test -d po || mkdir po
+      if test "x$srcdir" != "x."; then
+	 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+	    posrcprefix="$srcdir/"
+	 else
+	    posrcprefix="../$srcdir/"
+	 fi
+      else
+	 posrcprefix="../"
+      fi
+      rm -f po/POTFILES
+      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	 < $srcdir/po/POTFILES.in > po/POTFILES
+   fi
+  
+
+# Check for common headers.
+# FIXME: Seems to me this can cause problems for i386-windows hosts.
+# At one point there were hardcoded AC_DEFINE's if ${host} = i386-*-windows*.
+for ac_hdr in stdlib.h string.h strings.h unistd.h time.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2868: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2873 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in sys/time.h sys/resource.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2908: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2913 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in fcntl.h fpu_control.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2948: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2953 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_func in getrusage time sigaction __setfpucw
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2987: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2992 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+# Check for socket libraries
+echo $ac_n "checking for bind in -lsocket""... $ac_c" 1>&6
+echo "configure:3042: checking for bind in -lsocket" >&5
+ac_lib_var=`echo socket'_'bind | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lsocket  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3050 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char bind();
+
+int main() {
+bind()
+; return 0; }
+EOF
+if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lsocket $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:3089: checking for gethostbyname in -lnsl" >&5
+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lnsl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3097 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();
+
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:3108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lnsl $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+. ${srcdir}/../../bfd/configure.host
+
+
+
+USE_MAINTAINER_MODE=no
+# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  case "${enableval}" in
+  yes)	MAINT="" USE_MAINTAINER_MODE=yes ;;
+  no)	MAINT="#" ;;
+  *)	{ echo "configure: error: "--enable-maintainer-mode does not take a value"" 1>&2; exit 1; }; MAINT="#" ;;
+esac
+if test x"$silent" != x"yes" && test x"$MAINT" = x""; then
+  echo "Setting maintainer mode" 6>&1
+fi
+else
+  MAINT="#"
+fi
+
+
+
+# Check whether --enable-sim-bswap or --disable-sim-bswap was given.
+if test "${enable_sim_bswap+set}" = set; then
+  enableval="$enable_sim_bswap"
+  case "${enableval}" in
+  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
+  no)	sim_bswap="-DWITH_BSWAP=0";;
+  *)	{ echo "configure: error: "--enable-sim-bswap does not take a value"" 1>&2; exit 1; }; sim_bswap="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
+  echo "Setting bswap flags = $sim_bswap" 6>&1
+fi
+else
+  sim_bswap=""
+fi
+
+
+
+# Check whether --enable-sim-cflags or --disable-sim-cflags was given.
+if test "${enable_sim_cflags+set}" = set; then
+  enableval="$enable_sim_cflags"
+  case "${enableval}" in
+  yes)	 sim_cflags="-O2 -fomit-frame-pointer";;
+  trace) { echo "configure: error: "Please use --enable-sim-debug instead."" 1>&2; exit 1; }; sim_cflags="";;
+  no)	 sim_cflags="";;
+  *)	 sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_cflags" != x""; then
+  echo "Setting sim cflags = $sim_cflags" 6>&1
+fi
+else
+  sim_cflags=""
+fi
+
+
+
+# Check whether --enable-sim-debug or --disable-sim-debug was given.
+if test "${enable_sim_debug+set}" = set; then
+  enableval="$enable_sim_debug"
+  case "${enableval}" in
+  yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
+  no)  sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
+  *)   sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
+  echo "Setting sim debug = $sim_debug" 6>&1
+fi
+else
+  sim_debug=""
+fi
+
+
+
+# Check whether --enable-sim-stdio or --disable-sim-stdio was given.
+if test "${enable_sim_stdio+set}" = set; then
+  enableval="$enable_sim_stdio"
+  case "${enableval}" in
+  yes)	sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
+  no)	sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
+  *)	{ echo "configure: error: "Unknown value $enableval passed to --enable-sim-stdio"" 1>&2; exit 1; }; sim_stdio="";;
+esac
+if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
+  echo "Setting stdio flags = $sim_stdio" 6>&1
+fi
+else
+  sim_stdio=""
+fi
+
+
+
+# Check whether --enable-sim-trace or --disable-sim-trace was given.
+if test "${enable_sim_trace+set}" = set; then
+  enableval="$enable_sim_trace"
+  case "${enableval}" in
+  yes)	sim_trace="-DTRACE=1 -DWITH_TRACE=-1";;
+  no)	sim_trace="-DTRACE=0 -DWITH_TRACE=0";;
+  [-0-9]*)
+	sim_trace="-DTRACE='(${enableval})' -DWITH_TRACE='(${enableval})'";;
+  [a-z]*)
+	sim_trace=""
+	for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
+	  if test x"$sim_trace" = x; then
+	    sim_trace="-DWITH_TRACE='(TRACE_$x"
+	  else
+	    sim_trace="${sim_trace}|TRACE_$x"
+	  fi
+	done
+	sim_trace="$sim_trace)'" ;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
+  echo "Setting sim trace = $sim_trace" 6>&1
+fi
+else
+  sim_trace=""
+fi
+
+
+
+# Check whether --enable-sim-profile or --disable-sim-profile was given.
+if test "${enable_sim_profile+set}" = set; then
+  enableval="$enable_sim_profile"
+  case "${enableval}" in
+  yes)	sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
+  no)	sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
+  [-0-9]*)
+	sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
+  [a-z]*)
+	sim_profile=""
+	for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
+	  if test x"$sim_profile" = x; then
+	    sim_profile="-DWITH_PROFILE='(PROFILE_$x"
+	  else
+	    sim_profile="${sim_profile}|PROFILE_$x"
+	  fi
+	done
+	sim_profile="$sim_profile)'" ;;
+esac
+if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
+  echo "Setting sim profile = $sim_profile" 6>&1
+fi
+else
+  sim_profile=""
+fi
+
+
+
+echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+echo "configure:3284: checking return type of signal handlers" >&5
+if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3289 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+#undef signal
+#endif
+#ifdef __cplusplus
+extern "C" void (*signal (int, void (*)(int)))(int);
+#else
+void (*signal ()) ();
+#endif
+
+int main() {
+int i;
+; return 0; }
+EOF
+if { (eval echo configure:3306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_type_signal=void
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_type_signal=int
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_type_signal" 1>&6
+cat >> confdefs.h <<EOF
+#define RETSIGTYPE $ac_cv_type_signal
+EOF
+
+
+
+echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+echo "configure:3326: checking for executable suffix" >&5
+if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$CYGWIN32" = yes; then
+am_cv_exeext=.exe
+else
+cat > am_c_test.c << 'EOF'
+int main() {
+/* Nothing needed here */
+}
+EOF
+${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
+am_cv_exeext=`ls am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
+rm -f am_c_test*
+fi
+
+test x"${am_cv_exeext}" = x && am_cv_exeext=no
+fi
+EXEEXT=""
+test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext}
+echo "$ac_t""${am_cv_exeext}" 1>&6
+
+
+sim_link_files=
+sim_link_links=
+
+sim_link_links=tconfig.h
+if test -f ${srcdir}/tconfig.in
+then
+  sim_link_files=tconfig.in
+else
+  sim_link_files=../common/tconfig.in
+fi
+
+# targ-vals.def points to the libc macro description file.
+case "${target}" in
+*-*-*) TARG_VALS_DEF=../common/nltvals.def ;;
+esac
+sim_link_files="${sim_link_files} ${TARG_VALS_DEF}"
+sim_link_links="${sim_link_links} targ-vals.def"
+
+
+
+
+# Check whether --enable-build-warnings or --disable-build-warnings was given.
+if test "${enable_build_warnings+set}" = set; then
+  enableval="$enable_build_warnings"
+  build_warnings="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
+case "${enableval}" in
+  yes)	;;
+  no)	build_warnings="-w";;
+  ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+	build_warnings="${build_warnings} ${t}";;
+  *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
+	build_warnings="${t} ${build_warnings}";;
+  *)	build_warnings=`echo "${enableval}" | sed -e "s/,/ /g"`;;
+esac
+if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then
+  echo "Setting warning flags = $build_warnings" 6>&1
+fi
+else
+  build_warnings=""
+fi
+
+
+for ac_hdr in unistd.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:3396: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3401 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+
+
+
+trap '' 1 2 15
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set) 2>&1 | grep ac_space` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Any assignment to VPATH causes Sun make to only execute
+# the first set of double-colon rules, so remove it if not needed.
+# If there is a colon in the path, we need to keep it.
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+fi
+
+trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+
+DEFS=-DHAVE_CONFIG_H
+
+# Without the "./", some shells look in PATH for config.status.
+: ${CONFIG_STATUS=./config.status}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
+# Generated automatically by configure.
+# Run this file to recreate the current configuration.
+# This directory was configured as follows,
+# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+#
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+for ac_option
+do
+  case "\$ac_option" in
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+    echo "$CONFIG_STATUS generated by autoconf version 2.12.2"
+    exit 0 ;;
+  -help | --help | --hel | --he | --h)
+    echo "\$ac_cs_usage"; exit 0 ;;
+  *) echo "\$ac_cs_usage"; exit 1 ;;
+  esac
+done
+
+ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
+
+trap 'rm -fr `echo "Makefile.sim:Makefile.in Make-common.sim:../common/Make-common.in .gdbinit:../common/gdbinit.in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+$ac_vpsub
+$extrasub
+s%@sim_environment@%$sim_environment%g
+s%@sim_alignment@%$sim_alignment%g
+s%@sim_assert@%$sim_assert%g
+s%@sim_bitsize@%$sim_bitsize%g
+s%@sim_endian@%$sim_endian%g
+s%@sim_hostendian@%$sim_hostendian%g
+s%@sim_float@%$sim_float%g
+s%@sim_scache@%$sim_scache%g
+s%@sim_default_model@%$sim_default_model%g
+s%@sim_hw_cflags@%$sim_hw_cflags%g
+s%@sim_hw_objs@%$sim_hw_objs%g
+s%@sim_hw@%$sim_hw%g
+s%@sim_inline@%$sim_inline%g
+s%@sim_packages@%$sim_packages%g
+s%@sim_regparm@%$sim_regparm%g
+s%@sim_reserved_bits@%$sim_reserved_bits%g
+s%@sim_smp@%$sim_smp%g
+s%@sim_stdcall@%$sim_stdcall%g
+s%@sim_xor_endian@%$sim_xor_endian%g
+s%@build_warnings@%$build_warnings%g
+s%@SHELL@%$SHELL%g
+s%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%g
+s%@DEFS@%$DEFS%g
+s%@LDFLAGS@%$LDFLAGS%g
+s%@LIBS@%$LIBS%g
+s%@exec_prefix@%$exec_prefix%g
+s%@prefix@%$prefix%g
+s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@mandir@%$mandir%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@target@%$target%g
+s%@target_alias@%$target_alias%g
+s%@target_cpu@%$target_cpu%g
+s%@target_vendor@%$target_vendor%g
+s%@target_os@%$target_os%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
+s%@CC@%$CC%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
+s%@HDEFINES@%$HDEFINES%g
+s%@AR@%$AR%g
+s%@RANLIB@%$RANLIB%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@CPP@%$CPP%g
+s%@ALLOCA@%$ALLOCA%g
+s%@USE_NLS@%$USE_NLS%g
+s%@MSGFMT@%$MSGFMT%g
+s%@GMSGFMT@%$GMSGFMT%g
+s%@XGETTEXT@%$XGETTEXT%g
+s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
+s%@CATALOGS@%$CATALOGS%g
+s%@CATOBJEXT@%$CATOBJEXT%g
+s%@DATADIRNAME@%$DATADIRNAME%g
+s%@GMOFILES@%$GMOFILES%g
+s%@INSTOBJEXT@%$INSTOBJEXT%g
+s%@INTLDEPS@%$INTLDEPS%g
+s%@INTLLIBS@%$INTLLIBS%g
+s%@INTLOBJS@%$INTLOBJS%g
+s%@POFILES@%$POFILES%g
+s%@POSUB@%$POSUB%g
+s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
+s%@GT_NO@%$GT_NO%g
+s%@GT_YES@%$GT_YES%g
+s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
+s%@l@%$l%g
+s%@MAINT@%$MAINT%g
+s%@sim_bswap@%$sim_bswap%g
+s%@sim_cflags@%$sim_cflags%g
+s%@sim_debug@%$sim_debug%g
+s%@sim_stdio@%$sim_stdio%g
+s%@sim_trace@%$sim_trace%g
+s%@sim_profile@%$sim_profile%g
+s%@EXEEXT@%$EXEEXT%g
+
+CEOF
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"Makefile.sim:Makefile.in Make-common.sim:../common/Make-common.in .gdbinit:../common/gdbinit.in"}
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+    # The file is in a subdirectory.
+    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dir_suffix.
+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dir_suffix= ac_dots=
+  fi
+
+  case "$ac_given_srcdir" in
+  .)  srcdir=.
+      if test -z "$ac_dots"; then top_srcdir=.
+      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+  *) # Relative path.
+    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+
+  echo creating "$ac_file"
+  rm -f "$ac_file"
+  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  case "$ac_file" in
+  *Makefile*) ac_comsub="1i\\
+# $configure_input" ;;
+  *) ac_comsub= ;;
+  esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  sed -e "$ac_comsub
+s%@configure_input@%$configure_input%g
+s%@srcdir@%$srcdir%g
+s%@top_srcdir@%$top_srcdir%g
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+fi; done
+rm -f conftest.s*
+
+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+# NAME is the cpp macro being defined and VALUE is the value it is being given.
+#
+# ac_d sets the value in "#define NAME VALUE" lines.
+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
+ac_dC='\3'
+ac_dD='%g'
+# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_uB='\([ 	]\)%\1#\2define\3'
+ac_uC=' '
+ac_uD='\4%g'
+# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_eB='$%\1#\2define\3'
+ac_eC=' '
+ac_eD='%g'
+
+if test "${CONFIG_HEADERS+set}" != set; then
+EOF
+cat >> $CONFIG_STATUS <<EOF
+  CONFIG_HEADERS="config.h:config.in"
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+fi
+for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case "$ac_file" in
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+  *) ac_file_in="${ac_file}.in" ;;
+  esac
+
+  echo creating $ac_file
+
+  rm -f conftest.frag conftest.in conftest.out
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  cat $ac_file_inputs > conftest.in
+
+EOF
+
+# Transform confdefs.h into a sed script conftest.vals that substitutes
+# the proper values into config.h.in to produce config.h.  And first:
+# Protect against being on the right side of a sed subst in config.status.
+# Protect against being in an unquoted here document in config.status.
+rm -f conftest.vals
+cat > conftest.hdr <<\EOF
+s/[\\&%]/\\&/g
+s%[\\$`]%\\&%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+s%ac_d%ac_u%gp
+s%ac_u%ac_e%gp
+EOF
+sed -n -f conftest.hdr confdefs.h > conftest.vals
+rm -f conftest.hdr
+
+# This sed command replaces #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+cat >> conftest.vals <<\EOF
+s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+EOF
+
+# Break up conftest.vals because some shells have a limit on
+# the size of here documents, and old seds have small limits too.
+
+rm -f conftest.tail
+while :
+do
+  ac_lines=`grep -c . conftest.vals`
+  # grep -c gives empty output for an empty file on some AIX systems.
+  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
+  # Write a limited-size here document to conftest.frag.
+  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+  echo 'CEOF
+  sed -f conftest.frag conftest.in > conftest.out
+  rm -f conftest.in
+  mv conftest.out conftest.in
+' >> $CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
+  rm -f conftest.vals
+  mv conftest.tail conftest.vals
+done
+rm -f conftest.vals
+
+cat >> $CONFIG_STATUS <<\EOF
+  rm -f conftest.frag conftest.h
+  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
+  cat conftest.in >> conftest.h
+  rm -f conftest.in
+  if cmp -s $ac_file conftest.h 2>/dev/null; then
+    echo "$ac_file is unchanged"
+    rm -f conftest.h
+  else
+    # Remove last slash and all that follows it.  Not all systems have dirname.
+      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+      # The file is in a subdirectory.
+      test ! -d "$ac_dir" && mkdir "$ac_dir"
+    fi
+    rm -f $ac_file
+    mv conftest.h $ac_file
+  fi
+fi; done
+
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+ac_sources="$sim_link_files"
+ac_dests="$sim_link_links"
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+srcdir=$ac_given_srcdir
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+
+  echo "linking $srcdir/$ac_source to $ac_dest"
+
+  if test ! -r $srcdir/$ac_source; then
+    { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
+  fi
+  rm -f $ac_dest
+
+  # Make relative symlinks.
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
+    # The dest file is in a subdirectory.
+    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
+    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dest_dir_suffix.
+    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dest_dir_suffix= ac_dots=
+  fi
+
+  case "$srcdir" in
+  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
+  esac
+
+  # Make a symlink if possible; otherwise try a hard link.
+  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+    ln $srcdir/$ac_source $ac_dest; then :
+  else
+    { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
+  fi
+done
+EOF
+cat >> $CONFIG_STATUS <<EOF
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+case "x$CONFIG_FILES" in
+ xMakefile*)
+   echo "Merging Makefile.sim+Make-common.sim into Makefile ..."
+   rm -f Makesim1.tmp Makesim2.tmp Makefile
+   sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp
+   sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp
+   sed -e '/^## COMMON_PRE_/ r Makesim1.tmp' \
+	-e '/^## COMMON_POST_/ r Makesim2.tmp' \
+	<Makefile.sim >Makefile
+   rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp
+   ;;
+ esac
+ case "x$CONFIG_HEADERS" in xconfig.h:config.in) echo > stamp-h ;; esac
+
+exit 0
+EOF
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
+
diff --git a/sim/d10v/configure.in b/sim/d10v/configure.in
new file mode 100644
index 0000000..5debf66
--- /dev/null
+++ b/sim/d10v/configure.in
@@ -0,0 +1,13 @@
+dnl Process this file with autoconf to produce a configure script.
+sinclude(../common/aclocal.m4)
+AC_PREREQ(2.5)dnl
+AC_INIT(Makefile.in)
+
+SIM_AC_COMMON
+
+SIM_AC_OPTION_WARNINGS
+
+AC_CHECK_HEADERS(unistd.h)
+
+
+SIM_AC_OUTPUT
diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v_sim.h
new file mode 100644
index 0000000..ca7e02e
--- /dev/null
+++ b/sim/d10v/d10v_sim.h
@@ -0,0 +1,452 @@
+#include "config.h"
+#include <stdio.h>
+#include <ctype.h>
+#include <limits.h>
+#include "ansidecl.h"
+#include "callback.h"
+#include "opcode/d10v.h"
+#include "bfd.h"
+
+#define DEBUG_TRACE		0x00000001
+#define DEBUG_VALUES		0x00000002
+#define DEBUG_LINE_NUMBER	0x00000004
+#define DEBUG_MEMSIZE		0x00000008
+#define DEBUG_INSTRUCTION	0x00000010
+#define DEBUG_TRAP		0x00000020
+
+#ifndef	DEBUG
+#define	DEBUG (DEBUG_TRACE | DEBUG_VALUES | DEBUG_LINE_NUMBER)
+#endif
+
+extern int d10v_debug;
+
+#include "remote-sim.h"
+#include "sim-config.h"
+#include "sim-types.h"
+
+typedef unsigned8 uint8;
+typedef unsigned16 uint16;
+typedef signed16 int16;
+typedef unsigned32 uint32;
+typedef signed32 int32;
+typedef unsigned64 uint64;
+typedef signed64 int64;
+
+/* FIXME: D10V defines */
+typedef uint16 reg_t;
+
+struct simops 
+{
+  long opcode;
+  int  is_long;
+  long mask;
+  int format;
+  int cycles;
+  int unit;
+  int exec_type;
+  void (*func)();
+  int numops;
+  int operands[9];
+};
+
+enum _ins_type
+{
+  INS_UNKNOWN,			/* unknown instruction */
+  INS_COND_TRUE,		/* # times EXExxx executed other instruction */
+  INS_COND_FALSE,		/* # times EXExxx did not execute other instruction */
+  INS_COND_JUMP,		/* # times JUMP skipped other instruction */
+  INS_CYCLES,			/* # cycles */
+  INS_LONG,			/* long instruction (both containers, ie FM == 11) */
+  INS_LEFTRIGHT,		/* # times instruction encoded as L -> R (ie, FM == 01) */
+  INS_RIGHTLEFT,		/* # times instruction encoded as L <- R (ie, FM == 10) */
+  INS_PARALLEL,			/* # times instruction encoded as L || R (ie, RM == 00) */
+
+  INS_LEFT,			/* normal left instructions */
+  INS_LEFT_PARALLEL,		/* left side of || */
+  INS_LEFT_COND_TEST,		/* EXExx test on left side */
+  INS_LEFT_COND_EXE,		/* execution after EXExxx test on right side succeeded */
+  INS_LEFT_NOPS,		/* NOP on left side */
+
+  INS_RIGHT,			/* normal right instructions */
+  INS_RIGHT_PARALLEL,		/* right side of || */
+  INS_RIGHT_COND_TEST,		/* EXExx test on right side */
+  INS_RIGHT_COND_EXE,		/* execution after EXExxx test on left side succeeded */
+  INS_RIGHT_NOPS,		/* NOP on right side */
+
+  INS_MAX
+};
+
+extern unsigned long ins_type_counters[ (int)INS_MAX ];
+
+enum {
+  SP_IDX = 15,
+};
+
+/* Write-back slots */
+union slot_data {
+  unsigned_1 _1;
+  unsigned_2 _2;
+  unsigned_4 _4;
+  unsigned_8 _8;
+};
+struct slot {
+  void *dest;
+  int size;
+  union slot_data data;
+  union slot_data mask;
+};
+enum {
+ NR_SLOTS = 16,
+};
+#define SLOT (State.slot)
+#define SLOT_NR (State.slot_nr)
+#define SLOT_PEND_MASK(DEST, MSK, VAL) \
+  do \
+    { \
+      SLOT[SLOT_NR].dest = &(DEST); \
+      SLOT[SLOT_NR].size = sizeof (DEST); \
+      switch (sizeof (DEST)) \
+        { \
+        case 1: \
+          SLOT[SLOT_NR].data._1 = (unsigned_1) (VAL); \
+          SLOT[SLOT_NR].mask._1 = (unsigned_1) (MSK); \
+          break; \
+        case 2: \
+          SLOT[SLOT_NR].data._2 = (unsigned_2) (VAL); \
+          SLOT[SLOT_NR].mask._2 = (unsigned_2) (MSK); \
+          break; \
+        case 4: \
+          SLOT[SLOT_NR].data._4 = (unsigned_4) (VAL); \
+          SLOT[SLOT_NR].mask._4 = (unsigned_4) (MSK); \
+          break; \
+        case 8: \
+          SLOT[SLOT_NR].data._8 = (unsigned_8) (VAL); \
+          SLOT[SLOT_NR].mask._8 = (unsigned_8) (MSK); \
+          break; \
+        } \
+      SLOT_NR = (SLOT_NR + 1); \
+    } \
+  while (0)
+#define SLOT_PEND(DEST, VAL) SLOT_PEND_MASK(DEST, 0, VAL)
+#define SLOT_DISCARD() (SLOT_NR = 0)
+#define SLOT_FLUSH() \
+  do \
+    { \
+      int i; \
+      for (i = 0; i < SLOT_NR; i++) \
+	{ \
+	  switch (SLOT[i].size) \
+	    { \
+	    case 1: \
+	      *(unsigned_1*) SLOT[i].dest &= SLOT[i].mask._1; \
+	      *(unsigned_1*) SLOT[i].dest |= SLOT[i].data._1; \
+	      break; \
+	    case 2: \
+	      *(unsigned_2*) SLOT[i].dest &= SLOT[i].mask._2; \
+	      *(unsigned_2*) SLOT[i].dest |= SLOT[i].data._2; \
+	      break; \
+	    case 4: \
+	      *(unsigned_4*) SLOT[i].dest &= SLOT[i].mask._4; \
+	      *(unsigned_4*) SLOT[i].dest |= SLOT[i].data._4; \
+	      break; \
+	    case 8: \
+	      *(unsigned_8*) SLOT[i].dest &= SLOT[i].mask._8; \
+	      *(unsigned_8*) SLOT[i].dest |= SLOT[i].data._8; \
+	      break; \
+	    } \
+        } \
+      SLOT_NR = 0; \
+    } \
+  while (0)
+#define SLOT_DUMP() \
+  do \
+    { \
+      int i; \
+      for (i = 0; i < SLOT_NR; i++) \
+	{ \
+	  switch (SLOT[i].size) \
+	    { \
+	    case 1: \
+              printf ("SLOT %d *0x%08lx & 0x%02x | 0x%02x\n", i, \
+		      (long) SLOT[i].dest, \
+                      (unsigned) SLOT[i].mask._1, \
+                      (unsigned) SLOT[i].data._1); \
+	      break; \
+	    case 2: \
+              printf ("SLOT %d *0x%08lx & 0x%04x | 0x%04x\n", i, \
+		      (long) SLOT[i].dest, \
+                      (unsigned) SLOT[i].mask._2, \
+                      (unsigned) SLOT[i].data._2); \
+	      break; \
+	    case 4: \
+              printf ("SLOT %d *0x%08lx & 0x%08x | 0x%08x\n", i, \
+		      (long) SLOT[i].dest, \
+                      (unsigned) SLOT[i].mask._4, \
+                      (unsigned) SLOT[i].data._4); \
+	      break; \
+	    case 8: \
+              printf ("SLOT %d *0x%08lx & 0x%08x%08x | 0x%08x%08x\n", i, \
+		      (long) SLOT[i].dest, \
+                      (unsigned) (SLOT[i].mask._8 >> 32),  \
+                      (unsigned) SLOT[i].mask._8, \
+                      (unsigned) (SLOT[i].data._8 >> 32),  \
+                      (unsigned) SLOT[i].data._8); \
+	      break; \
+	    } \
+        } \
+    } \
+  while (0)
+
+struct _state
+{
+  reg_t regs[16];		/* general-purpose registers */
+#define GPR(N) (State.regs[(N)] + 0)
+#define SET_GPR(N,VAL) SLOT_PEND (State.regs[(N)], (VAL))
+
+#define GPR32(N) ((((uint32) State.regs[(N) + 0]) << 16) \
+		  | (uint16) State.regs[(N) + 1])
+#define SET_GPR32(N,VAL) do { SET_GPR (OP[0] + 0, (VAL) >> 16); SET_GPR (OP[0] + 1, (VAL)); } while (0)
+
+  reg_t cregs[16];		/* control registers */
+#define CREG(N) (State.cregs[(N)] + 0)
+#define SET_CREG(N,VAL) move_to_cr ((N), 0, (VAL))
+
+  reg_t sp[2];                  /* holding area for SPI(0)/SPU(1) */
+#define HELD_SP(N) (State.sp[(N)] + 0)
+#define SET_HELD_SP(N,VAL) SLOT_PEND (State.sp[(N)], (VAL))
+
+  int64 a[2];			/* accumulators */
+#define ACC(N) (State.a[(N)] + 0)
+#define SET_ACC(N,VAL) SLOT_PEND (State.a[(N)], (VAL) & MASK40)
+
+  /* writeback info */
+  struct slot slot[NR_SLOTS];
+  int slot_nr;
+
+  /* trace data */
+  struct {
+    uint16 psw;
+  } trace;
+
+  uint8 exe;
+  int	exception;
+  int	pc_changed;
+
+  /* NOTE: everything below this line is not reset by sim_create_inferior() */
+  uint8 *imem;
+  uint8 *dmem;
+  uint8 *umem[128];
+  enum _ins_type ins_type;
+
+} State;
+
+
+extern host_callback *d10v_callback;
+extern uint16 OP[4];
+extern struct simops Simops[];
+extern asection *text;
+extern bfd_vma text_start;
+extern bfd_vma text_end;
+extern bfd *prog_bfd;
+
+enum
+{
+  PSW_CR = 0,
+  BPSW_CR = 1,
+  PC_CR = 2,
+  BPC_CR = 3,
+  DPSW_CR = 4,
+  DPC_CR = 5,
+  RPT_C_CR = 7,
+  RPT_S_CR = 8,
+  RPT_E_CR = 9,
+  MOD_S_CR = 10,
+  MOD_E_CR = 11,
+  IBA_CR = 14,
+};
+
+enum
+{
+  PSW_SM_BIT = 0x8000,
+  PSW_EA_BIT = 0x2000,
+  PSW_DB_BIT = 0x1000,
+  PSW_DM_BIT = 0x0800,
+  PSW_IE_BIT = 0x0400,
+  PSW_RP_BIT = 0x0200,
+  PSW_MD_BIT = 0x0100,
+  PSW_FX_BIT = 0x0080,
+  PSW_ST_BIT = 0x0040,
+  PSW_F0_BIT = 0x0008,
+  PSW_F1_BIT = 0x0004,
+  PSW_C_BIT =  0x0001,
+};
+
+#define PSW CREG (PSW_CR)
+#define SET_PSW(VAL) SET_CREG (PSW_CR, (VAL))
+#define SET_PSW_BIT(MASK,VAL) move_to_cr (PSW_CR, ~(MASK), (VAL) ? (MASK) : 0)
+
+#define PSW_SM ((PSW & PSW_SM_BIT) != 0)
+#define SET_PSW_SM(VAL) SET_PSW_BIT (PSW_SM_BIT, (VAL))
+
+#define PSW_EA ((PSW & PSW_EA_BIT) != 0)
+#define SET_PSW_EA(VAL) SET_PSW_BIT (PSW_EA_BIT, (VAL))
+
+#define PSW_DB ((PSW & PSW_DB_BIT) != 0)
+#define SET_PSW_DB(VAL) SET_PSW_BIT (PSW_DB_BIT, (VAL))
+
+#define PSW_DM ((PSW & PSW_DM_BIT) != 0)
+#define SET_PSW_DM(VAL) SET_PSW_BIT (PSW_DM_BIT, (VAL))
+
+#define PSW_IE ((PSW & PSW_IE_BIT) != 0)
+#define SET_PSW_IE(VAL) SET_PSW_BIT (PSW_IE_BIT, (VAL))
+
+#define PSW_RP ((PSW & PSW_RP_BIT) != 0)
+#define SET_PSW_RP(VAL) SET_PSW_BIT (PSW_RP_BIT, (VAL))
+
+#define PSW_MD ((PSW & PSW_MD_BIT) != 0)
+#define SET_PSW_MD(VAL) SET_PSW_BIT (PSW_MD_BIT, (VAL))
+
+#define PSW_FX ((PSW & PSW_FX_BIT) != 0)
+#define SET_PSW_FX(VAL) SET_PSW_BIT (PSW_FX_BIT, (VAL))
+
+#define PSW_ST ((PSW & PSW_ST_BIT) != 0)
+#define SET_PSW_ST(VAL) SET_PSW_BIT (PSW_ST_BIT, (VAL))
+
+#define PSW_F0 ((PSW & PSW_F0_BIT) != 0)
+#define SET_PSW_F0(VAL) SET_PSW_BIT (PSW_F0_BIT, (VAL))
+
+#define PSW_F1 ((PSW & PSW_F1_BIT) != 0)
+#define SET_PSW_F1(VAL) SET_PSW_BIT (PSW_F1_BIT, (VAL))
+
+#define PSW_C ((PSW & PSW_C_BIT) != 0)
+#define SET_PSW_C(VAL) SET_PSW_BIT (PSW_C_BIT, (VAL))
+
+/* See simopsc.:move_to_cr() for registers that can not be read-from
+   or assigned-to directly */
+
+#define PC	CREG (PC_CR)
+#define SET_PC(VAL) SET_CREG (PC_CR, (VAL))
+
+#define BPSW	CREG (BPSW_CR)
+#define SET_BPSW(VAL) SET_CREG (BPSW_CR, (VAL))
+
+#define BPC	CREG (BPC_CR)
+#define SET_BPC(VAL) SET_CREG (BPC_CR, (VAL))
+
+#define DPSW	CREG (DPSW_CR)
+#define SET_DPSW(VAL) SET_CREG (DPSW_CR, (VAL))
+
+#define DPC	CREG (DPC_CR)
+#define SET_DPC(VAL) SET_CREG (DPC_CR, (VAL))
+
+#define RPT_C	CREG (RPT_C_CR)
+#define SET_RPT_C(VAL) SET_CREG (RPT_C_CR, (VAL))
+
+#define RPT_S	CREG (RPT_S_CR)
+#define SET_RPT_S(VAL) SET_CREG (RPT_S_CR, (VAL))
+
+#define RPT_E	CREG (RPT_E_CR)
+#define SET_RPT_E(VAL) SET_CREG (RPT_E_CR, (VAL))
+
+#define MOD_S	CREG (MOD_S_CR)
+#define SET_MOD_S(VAL) SET_CREG (MOD_S_CR, (VAL))
+
+#define MOD_E	CREG (MOD_E_CR)
+#define SET_MOD_E(VAL) SET_CREG (MOD_E_CR, (VAL))
+
+#define IBA	CREG (IBA_CR)
+#define SET_IBA(VAL) SET_CREG (IBA_CR, (VAL))
+
+
+#define SIG_D10V_STOP	-1
+#define SIG_D10V_EXIT	-2
+
+#define SEXT3(x)	((((x)&0x7)^(~3))+4)	
+
+/* sign-extend a 4-bit number */
+#define SEXT4(x)	((((x)&0xf)^(~7))+8)	
+
+/* sign-extend an 8-bit number */
+#define SEXT8(x)	((((x)&0xff)^(~0x7f))+0x80)
+
+/* sign-extend a 16-bit number */
+#define SEXT16(x)	((((x)&0xffff)^(~0x7fff))+0x8000)
+
+/* sign-extend a 32-bit number */
+#define SEXT32(x)	((((x)&SIGNED64(0xffffffff))^(~SIGNED64(0x7fffffff)))+SIGNED64(0x80000000))
+
+/* sign extend a 40 bit number */
+#define SEXT40(x)	((((x)&SIGNED64(0xffffffffff))^(~SIGNED64(0x7fffffffff)))+SIGNED64(0x8000000000))
+
+/* sign extend a 44 bit number */
+#define SEXT44(x)	((((x)&SIGNED64(0xfffffffffff))^(~SIGNED64(0x7ffffffffff)))+SIGNED64(0x80000000000))
+
+/* sign extend a 56 bit number */
+#define SEXT56(x)	((((x)&SIGNED64(0xffffffffffffff))^(~SIGNED64(0x7fffffffffffff)))+SIGNED64(0x80000000000000))
+
+/* sign extend a 60 bit number */
+#define SEXT60(x)	((((x)&SIGNED64(0xfffffffffffffff))^(~SIGNED64(0x7ffffffffffffff)))+SIGNED64(0x800000000000000))
+
+#define MAX32	SIGNED64(0x7fffffff)
+#define MIN32	SIGNED64(0xff80000000)
+#define MASK32	SIGNED64(0xffffffff)
+#define MASK40	SIGNED64(0xffffffffff)
+
+/* The alignment of MOD_E in the following macro depends upon "i"
+   always being a power of 2. */
+#define INC_ADDR(x,i) \
+do \
+  { \
+    if (PSW_MD && GPR (x) == (MOD_E & ~((i) - 1))) \
+      SET_GPR (x, MOD_S); \
+    else \
+      SET_GPR (x, GPR (x) + (i)); \
+  } \
+while (0)
+
+extern uint8 *dmem_addr PARAMS ((uint32));
+extern uint8 *imem_addr PARAMS ((uint32));
+extern bfd_vma decode_pc PARAMS ((void));
+
+#define	RB(x)	(*(dmem_addr(x)))
+#define SB(addr,data)	( RB(addr) = (data & 0xff))
+
+#if defined(__GNUC__) && defined(__OPTIMIZE__) && !defined(NO_ENDIAN_INLINE)
+#define ENDIAN_INLINE static __inline__
+#include "endian.c"
+#undef ENDIAN_INLINE
+
+#else
+extern uint32 get_longword PARAMS ((uint8 *));
+extern uint16 get_word PARAMS ((uint8 *));
+extern int64 get_longlong PARAMS ((uint8 *));
+extern void write_word PARAMS ((uint8 *addr, uint16 data));
+extern void write_longword PARAMS ((uint8 *addr, uint32 data));
+extern void write_longlong PARAMS ((uint8 *addr, int64 data));
+#endif
+
+#define SW(addr,data)		write_word(dmem_addr(addr),data)
+#define RW(x)			get_word(dmem_addr(x))
+#define SLW(addr,data)  	write_longword(dmem_addr(addr),data)
+#define RLW(x)			get_longword(dmem_addr(x))
+#define READ_16(x)		get_word(x)
+#define WRITE_16(addr,data)	write_word(addr,data)
+#define READ_64(x)		get_longlong(x)
+#define WRITE_64(addr,data)	write_longlong(addr,data)
+
+#define IMAP0			RW(0xff00)
+#define IMAP1			RW(0xff02)
+#define DMAP			RW(0xff04)
+#define SET_IMAP0(x)		SW(0xff00,x)
+#define SET_IMAP1(x)		SW(0xff02,x)
+#define SET_DMAP(x)		SW(0xff04,x)
+
+#define JMP(x)			do { SET_PC (x); State.pc_changed = 1; } while (0)
+
+#define RIE_VECTOR_START 0xffc2
+#define AE_VECTOR_START 0xffc3
+#define TRAP_VECTOR_START 0xffc4	/* vector for trap 0 */
+#define DBT_VECTOR_START 0xffd4
+#define SDBT_VECTOR_START 0xffd5
+
+extern reg_t move_to_cr PARAMS ((int cr, reg_t mask, reg_t val));
diff --git a/sim/d10v/endian.c b/sim/d10v/endian.c
new file mode 100644
index 0000000..9ef503e
--- /dev/null
+++ b/sim/d10v/endian.c
@@ -0,0 +1,137 @@
+/* If we're being compiled as a .c file, rather than being included in
+   d10v_sim.h, then ENDIAN_INLINE won't be defined yet.  */
+
+#ifndef ENDIAN_INLINE
+#define NO_ENDIAN_INLINE
+#include "d10v_sim.h"
+#define ENDIAN_INLINE
+#endif
+
+ENDIAN_INLINE uint16
+get_word (x)
+      uint8 *x;
+{
+#if (defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__)
+
+  unsigned short word = *(unsigned short *)x;
+  __asm__ ("xchgb %b0,%h0" : "=q" (word) : "0" (word));
+  return word;
+
+#elif defined(WORDS_BIGENDIAN)
+  /* It is safe to do this on big endian hosts, since the d10v requires that words be
+     aligned on 16-bit boundaries.  */
+  return *(uint16 *)x;
+
+#else
+  return ((uint16)x[0]<<8) + x[1];
+#endif
+}
+
+ENDIAN_INLINE uint32
+get_longword (x)
+      uint8 *x;
+{
+#if (defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__) && defined(USE_BSWAP)
+
+  unsigned int long_word = *(unsigned *)x;
+  __asm__ ("bswap %0" : "=r" (long_word) : "0" (long_word));
+  return long_word;
+
+#elif (defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__)
+
+  unsigned int long_word = *(unsigned *)x;
+  __asm__("xchgb %b0,%h0\n\t"		/* swap lower bytes	*/
+	  "rorl $16,%0\n\t"		/* swap words		*/
+	  "xchgb %b0,%h0"		/* swap higher bytes	*/
+	  :"=q" (long_word)
+	  : "0" (long_word));
+
+  return long_word;
+
+#elif (defined(_POWER) && defined(_AIX)) || (defined(__PPC__) && defined(__BIG_ENDIAN__))
+  /* Power & PowerPC computers in big endian mode can handle unaligned loads&stores */
+  return *(uint32 *)x;
+
+#elif defined(WORDS_BIGENDIAN)
+  /* long words must be aligned on at least 16-bit boundaries, so this should be safe.  */
+  return (((uint32) *(uint16 *)x)<<16) | ((uint32) *(uint16 *)(x+2));
+
+#else
+  return ((uint32)x[0]<<24) + ((uint32)x[1]<<16) + ((uint32)x[2]<<8) + ((uint32)x[3]);
+#endif
+}
+
+ENDIAN_INLINE int64
+get_longlong (x)
+      uint8 *x;
+{
+  uint32 top = get_longword (x);
+  uint32 bottom = get_longword (x+4);
+  return (((int64)top)<<32) | (int64)bottom;
+}
+
+ENDIAN_INLINE void
+write_word (addr, data)
+     uint8 *addr;
+     uint16 data;
+{
+#if (defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__)
+
+  __asm__ ("xchgb %b0,%h0" : "=q" (data) : "0" (data));
+  *(uint16 *)addr = data;
+
+#elif defined(WORDS_BIGENDIAN)
+  /* It is safe to do this on big endian hosts, since the d10v requires that words be
+     aligned on 16-bit boundaries.  */
+  *(uint16 *)addr = data;
+
+#else
+  addr[0] = (data >> 8) & 0xff;
+  addr[1] = data & 0xff;
+#endif
+}
+
+ENDIAN_INLINE void
+write_longword (addr, data)
+     uint8 *addr;
+     uint32 data;
+{
+#if (defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__) && defined(USE_BSWAP)
+
+  __asm__ ("bswap %0" : "=r" (data) : "0" (data));
+  *(uint32 *)addr = data;
+
+#elif (defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__)) && defined(__GNUC__)
+
+  __asm__("xchgb %b0,%h0\n\t"		/* swap lower bytes	*/
+	  "rorl $16,%0\n\t"		/* swap words		*/
+	  "xchgb %b0,%h0"		/* swap higher bytes	*/
+	  :"=q" (data)
+	  : "0" (data));
+
+  *(uint32 *)addr = data;
+
+#elif (defined(_POWER) && defined(_AIX)) || (defined(__PPC__) && defined(__BIG_ENDIAN__))
+  /* Power & PowerPC computers in big endian mode can handle unaligned loads&stores */
+  *(uint32 *)addr = data;
+
+#elif defined(WORDS_BIGENDIAN)
+  *(uint16 *)addr = (uint16)(data >> 16);
+  *(uint16 *)(addr + 2) = (uint16)data;
+
+#else
+  addr[0] = (data >> 24) & 0xff;
+  addr[1] = (data >> 16) & 0xff;
+  addr[2] = (data >> 8) & 0xff;
+  addr[3] = data & 0xff;
+#endif
+}
+
+ENDIAN_INLINE void
+write_longlong (addr, data)
+     uint8 *addr;
+     int64 data;
+{
+  write_longword (addr, (uint32)(data >> 32));
+  write_longword (addr+4, (uint32)data);
+}
diff --git a/sim/d10v/gencode.c b/sim/d10v/gencode.c
new file mode 100644
index 0000000..2d1269b
--- /dev/null
+++ b/sim/d10v/gencode.c
@@ -0,0 +1,156 @@
+#include "config.h"
+#include <stdio.h>
+#include <ctype.h>
+#include <limits.h>
+#include "ansidecl.h"
+#include "callback.h"
+#include "opcode/d10v.h"
+
+static void write_header PARAMS ((void));
+static void write_opcodes PARAMS ((void));
+static void write_template PARAMS ((void));
+
+int
+main (argc, argv)
+     int argc;
+     char *argv[];
+{
+  if ((argc > 1) && (strcmp (argv[1],"-h") == 0))
+    write_header();
+  else if ((argc > 1) && (strcmp (argv[1],"-t") == 0))
+    write_template ();
+  else
+    write_opcodes();
+  return 0;
+}
+
+
+static void
+write_header ()
+{
+  struct d10v_opcode *opcode;
+
+  for (opcode = (struct d10v_opcode *)d10v_opcodes; opcode->name; opcode++)
+    if (opcode->format != OPCODE_FAKE)
+      printf("void OP_%X PARAMS ((void));\t\t/* %s */\n",opcode->opcode, opcode->name);
+}
+
+
+/* write_template creates a file all required functions, ready */
+/* to be filled out */
+
+static void
+write_template ()
+{
+  struct d10v_opcode *opcode;
+  int i,j;
+
+  printf ("#include \"d10v_sim.h\"\n");
+  printf ("#include \"simops.h\"\n");
+
+  for (opcode = (struct d10v_opcode *)d10v_opcodes; opcode->name; opcode++)
+    {
+      if (opcode->format != OPCODE_FAKE)
+	{
+	  printf("/* %s */\nvoid\nOP_%X ()\n{\n",opcode->name,opcode->opcode);
+	  
+	  /* count operands */
+	  j = 0;
+	  for (i=0;i<6;i++)
+	    {
+	      int flags = d10v_operands[opcode->operands[i]].flags;
+	      if ((flags & OPERAND_REG) || (flags & OPERAND_NUM) || (flags & OPERAND_ADDR))
+		j++;
+	    }
+	  switch (j)
+	    {
+	    case 0:
+	      printf ("printf(\"   %s\\n\");\n",opcode->name);
+	      break;
+	    case 1:
+	      printf ("printf(\"   %s\\t%%x\\n\",OP[0]);\n",opcode->name);
+	      break;
+	    case 2:
+	      printf ("printf(\"   %s\\t%%x,%%x\\n\",OP[0],OP[1]);\n",opcode->name);
+	      break;
+	    case 3:
+	      printf ("printf(\"   %s\\t%%x,%%x,%%x\\n\",OP[0],OP[1],OP[2]);\n",opcode->name);
+	      break;
+	    default:
+	      fprintf (stderr,"Too many operands: %d\n",j);
+	    }
+	  printf ("}\n\n");
+	}
+    }
+}
+
+
+long Opcodes[512];
+static int curop=0;
+
+check_opcodes( long op)
+{
+  int i;
+
+  for (i=0;i<curop;i++)
+    if (Opcodes[i] == op)
+      fprintf(stderr,"DUPLICATE OPCODES: %x\n",op);
+}
+
+
+static void
+write_opcodes ()
+{
+  struct d10v_opcode *opcode;
+  int i, j;
+  
+  /* write out opcode table */
+  printf ("#include \"d10v_sim.h\"\n");
+  printf ("#include \"simops.h\"\n\n");
+  printf ("struct simops Simops[] = {\n");
+  
+  for (opcode = (struct d10v_opcode *)d10v_opcodes; opcode->name; opcode++)
+    {
+      if (opcode->format != OPCODE_FAKE)
+	{
+	  printf ("  { %ld,%d,%ld,%d,%d,%d,%d,OP_%X,", opcode->opcode, 
+		  (opcode->format & LONG_OPCODE) ? 1 : 0, opcode->mask, opcode->format, 
+		  opcode->cycles, opcode->unit, opcode->exec_type, opcode->opcode);
+      
+	  /* REMOVE ME */
+	  check_opcodes (opcode->opcode);
+	  Opcodes[curop++] = opcode->opcode;
+
+	  j = 0;
+	  for (i=0;i<6;i++)
+	    {
+	      int flags = d10v_operands[opcode->operands[i]].flags;
+	      if ((flags & OPERAND_REG) || (flags & OPERAND_NUM) || (flags & OPERAND_ADDR))
+		j++;
+	    }
+	  printf ("%d,",j);
+	  
+	  j = 0;
+	  for (i=0;i<6;i++)
+	    {
+	      int flags = d10v_operands[opcode->operands[i]].flags;
+	      int shift = d10v_operands[opcode->operands[i]].shift;
+	      if ((flags & OPERAND_REG) || (flags & OPERAND_NUM)|| (flags & OPERAND_ADDR))
+		{
+		  if (j == 0)
+		    printf ("{");
+		  else
+		    printf (", ");
+		  if ((flags & OPERAND_REG) && (opcode->format == LONG_L))
+		    shift += 15;
+		  printf ("%d,%d,%d",shift,d10v_operands[opcode->operands[i]].bits,flags);
+		  j = 1;
+		}
+	    }
+	  if (j)
+	    printf ("}");
+	  printf ("},\n");
+	}
+    }
+  printf ("{ 0,0,0,0,0,0,0,(void (*)(void))0,0,{0,0,0}},\n};\n");
+}
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
new file mode 100644
index 0000000..17c964f
--- /dev/null
+++ b/sim/d10v/interp.c
@@ -0,0 +1,1086 @@
+#include <signal.h>
+#include "sysdep.h"
+#include "bfd.h"
+#include "callback.h"
+#include "remote-sim.h"
+
+#include "d10v_sim.h"
+
+#define IMEM_SIZE 18		/* D10V instruction memory size is 18 bits */
+#define DMEM_SIZE 16		/* Data memory is 64K (but only 32K internal RAM) */
+#define UMEM_SIZE 17		/* Each unified memory segment is 17 bits */
+#define UMEM_SEGMENTS 128	/* Number of segments in unified memory region */
+
+enum _leftright { LEFT_FIRST, RIGHT_FIRST };
+
+static char *myname;
+static SIM_OPEN_KIND sim_kind;
+int d10v_debug;
+host_callback *d10v_callback;
+unsigned long ins_type_counters[ (int)INS_MAX ];
+
+uint16 OP[4];
+
+static int init_text_p = 0;
+/* non-zero if we opened prog_bfd */
+static int prog_bfd_was_opened_p;
+bfd *prog_bfd;
+asection *text;
+bfd_vma text_start;
+bfd_vma text_end;
+
+static long hash PARAMS ((long insn, int format));
+static struct hash_entry *lookup_hash PARAMS ((uint32 ins, int size));
+static void get_operands PARAMS ((struct simops *s, uint32 ins));
+static void do_long PARAMS ((uint32 ins));
+static void do_2_short PARAMS ((uint16 ins1, uint16 ins2, enum _leftright leftright));
+static void do_parallel PARAMS ((uint16 ins1, uint16 ins2));
+static char *add_commas PARAMS ((char *buf, int sizeof_buf, unsigned long value));
+extern void sim_set_profile PARAMS ((int n));
+extern void sim_set_profile_size PARAMS ((int n));
+
+#ifndef INLINE
+#if defined(__GNUC__) && defined(__OPTIMIZE__)
+#define INLINE __inline__
+#else
+#define INLINE
+#endif
+#endif
+
+#define MAX_HASH  63
+struct hash_entry
+{
+  struct hash_entry *next;
+  uint32 opcode;
+  uint32 mask;
+  int size;
+  struct simops *ops;
+};
+
+struct hash_entry hash_table[MAX_HASH+1];
+
+INLINE static long 
+hash(insn, format)
+     long insn;
+     int format;
+{
+  if (format & LONG_OPCODE)
+    return ((insn & 0x3F000000) >> 24);
+  else
+    return((insn & 0x7E00) >> 9);
+}
+
+INLINE static struct hash_entry *
+lookup_hash (ins, size)
+     uint32 ins;
+     int size;
+{
+  struct hash_entry *h;
+
+  if (size)
+    h = &hash_table[(ins & 0x3F000000) >> 24];
+  else
+    h = &hash_table[(ins & 0x7E00) >> 9];
+
+  while ((ins & h->mask) != h->opcode || h->size != size)
+    {
+      if (h->next == NULL)
+	{
+	  (*d10v_callback->printf_filtered) (d10v_callback, "ERROR looking up hash for %x at PC %x\n",ins, PC);
+	  exit (1);
+	}
+      h = h->next;
+    }
+  return (h);
+}
+
+INLINE static void
+get_operands (struct simops *s, uint32 ins)
+{
+  int i, shift, bits, flags;
+  uint32 mask;
+  for (i=0; i < s->numops; i++)
+    {
+      shift = s->operands[3*i];
+      bits = s->operands[3*i+1];
+      flags = s->operands[3*i+2];
+      mask = 0x7FFFFFFF >> (31 - bits);
+      OP[i] = (ins >> shift) & mask;
+    }
+  /* FIXME: for tracing, update values that need to be updated each
+     instruction decode cycle */
+  State.trace.psw = PSW;
+}
+
+bfd_vma
+decode_pc ()
+{
+  asection *s;
+  if (!init_text_p && prog_bfd != NULL)
+    {
+      init_text_p = 1;
+      for (s = prog_bfd->sections; s; s = s->next)
+	if (strcmp (bfd_get_section_name (prog_bfd, s), ".text") == 0)
+	  {
+	    text = s;
+	    text_start = bfd_get_section_vma (prog_bfd, s);
+	    text_end = text_start + bfd_section_size (prog_bfd, s);
+	    break;
+	  }
+    }
+
+  return (PC << 2) + text_start;
+}
+
+static void
+do_long (ins)
+     uint32 ins;
+{
+  struct hash_entry *h;
+#ifdef DEBUG
+  if ((d10v_debug & DEBUG_INSTRUCTION) != 0)
+    (*d10v_callback->printf_filtered) (d10v_callback, "do_long 0x%x\n", ins);
+#endif
+  h = lookup_hash (ins, 1);
+  get_operands (h->ops, ins);
+  State.ins_type = INS_LONG;
+  ins_type_counters[ (int)State.ins_type ]++;
+  (h->ops->func)();
+}
+
+static void
+do_2_short (ins1, ins2, leftright)
+     uint16 ins1, ins2;
+     enum _leftright leftright;
+{
+  struct hash_entry *h;
+  enum _ins_type first, second;
+
+#ifdef DEBUG
+  if ((d10v_debug & DEBUG_INSTRUCTION) != 0)
+    (*d10v_callback->printf_filtered) (d10v_callback, "do_2_short 0x%x (%s) -> 0x%x\n",
+				       ins1, (leftright) ? "left" : "right", ins2);
+#endif
+
+  if (leftright == LEFT_FIRST)
+    {
+      first = INS_LEFT;
+      second = INS_RIGHT;
+      ins_type_counters[ (int)INS_LEFTRIGHT ]++;
+    }
+  else
+    {
+      first = INS_RIGHT;
+      second = INS_LEFT;
+      ins_type_counters[ (int)INS_RIGHTLEFT ]++;
+    }
+
+  /* Issue the first instruction */
+  h = lookup_hash (ins1, 0);
+  get_operands (h->ops, ins1);
+  State.ins_type = first;
+  ins_type_counters[ (int)State.ins_type ]++;
+  (h->ops->func)();
+
+  /* Issue the second instruction (if the PC hasn't changed) */
+  if (!State.pc_changed && !State.exception)
+    {
+      /* finish any existing instructions */
+      SLOT_FLUSH ();
+      h = lookup_hash (ins2, 0);
+      get_operands (h->ops, ins2);
+      State.ins_type = second;
+      ins_type_counters[ (int)State.ins_type ]++;
+      ins_type_counters[ (int)INS_CYCLES ]++;
+      (h->ops->func)();
+    }
+  else if (!State.exception)
+    ins_type_counters[ (int)INS_COND_JUMP ]++;
+}
+
+static void
+do_parallel (ins1, ins2)
+     uint16 ins1, ins2;
+{
+  struct hash_entry *h1, *h2;
+#ifdef DEBUG
+  if ((d10v_debug & DEBUG_INSTRUCTION) != 0)
+    (*d10v_callback->printf_filtered) (d10v_callback, "do_parallel 0x%x || 0x%x\n", ins1, ins2);
+#endif
+  ins_type_counters[ (int)INS_PARALLEL ]++;
+  h1 = lookup_hash (ins1, 0);
+  h2 = lookup_hash (ins2, 0);
+
+  if (h1->ops->exec_type == PARONLY)
+    {
+      get_operands (h1->ops, ins1);
+      State.ins_type = INS_LEFT_COND_TEST;
+      ins_type_counters[ (int)State.ins_type ]++;
+      (h1->ops->func)();
+      if (State.exe)
+	{
+	  ins_type_counters[ (int)INS_COND_TRUE ]++;
+	  get_operands (h2->ops, ins2);
+	  State.ins_type = INS_RIGHT_COND_EXE;
+	  ins_type_counters[ (int)State.ins_type ]++;
+	  (h2->ops->func)();
+	}
+      else
+	ins_type_counters[ (int)INS_COND_FALSE ]++;
+    }
+  else if (h2->ops->exec_type == PARONLY)
+    {
+      get_operands (h2->ops, ins2);
+      State.ins_type = INS_RIGHT_COND_TEST;
+      ins_type_counters[ (int)State.ins_type ]++;
+      (h2->ops->func)();
+      if (State.exe)
+	{
+	  ins_type_counters[ (int)INS_COND_TRUE ]++;
+	  get_operands (h1->ops, ins1);
+	  State.ins_type = INS_LEFT_COND_EXE;
+	  ins_type_counters[ (int)State.ins_type ]++;
+	  (h1->ops->func)();
+	}
+      else
+	ins_type_counters[ (int)INS_COND_FALSE ]++;
+    }
+  else
+    {
+      get_operands (h1->ops, ins1);
+      State.ins_type = INS_LEFT_PARALLEL;
+      ins_type_counters[ (int)State.ins_type ]++;
+      (h1->ops->func)();
+      if (!State.exception)
+	{
+	  get_operands (h2->ops, ins2);
+	  State.ins_type = INS_RIGHT_PARALLEL;
+	  ins_type_counters[ (int)State.ins_type ]++;
+	  (h2->ops->func)();
+	}
+    }
+}
+ 
+static char *
+add_commas(buf, sizeof_buf, value)
+     char *buf;
+     int sizeof_buf;
+     unsigned long value;
+{
+  int comma = 3;
+  char *endbuf = buf + sizeof_buf - 1;
+
+  *--endbuf = '\0';
+  do {
+    if (comma-- == 0)
+      {
+	*--endbuf = ',';
+	comma = 2;
+      }
+
+    *--endbuf = (value % 10) + '0';
+  } while ((value /= 10) != 0);
+
+  return endbuf;
+}
+
+void
+sim_size (power)
+     int power;
+
+{
+  int i;
+
+  if (State.imem)
+    {
+      for (i=0;i<UMEM_SEGMENTS;i++)
+	{
+	  if (State.umem[i])
+	    {
+	      free (State.umem[i]);
+	      State.umem[i] = NULL;
+	    }
+	}
+      free (State.imem);
+      free (State.dmem);
+    }
+
+  State.imem = (uint8 *)calloc(1,1<<IMEM_SIZE);
+  State.dmem = (uint8 *)calloc(1,1<<DMEM_SIZE);
+  for (i=1;i<(UMEM_SEGMENTS-1);i++)
+    State.umem[i] = NULL;
+  State.umem[0] = (uint8 *)calloc(1,1<<UMEM_SIZE);
+  State.umem[1] = (uint8 *)calloc(1,1<<UMEM_SIZE);
+  State.umem[2] = (uint8 *)calloc(1,1<<UMEM_SIZE);
+  State.umem[UMEM_SEGMENTS-1] = (uint8 *)calloc(1,1<<UMEM_SIZE);
+  if (!State.imem || !State.dmem || !State.umem[0] || !State.umem[1] || !State.umem[2] || !State.umem[UMEM_SEGMENTS-1] )
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "Memory allocation failed.\n");
+      exit(1);
+    }
+  
+#ifdef DEBUG
+  if ((d10v_debug & DEBUG_MEMSIZE) != 0)
+    {
+      char buffer[20];
+      (*d10v_callback->printf_filtered) (d10v_callback,
+					 "Allocated %s bytes instruction memory and\n",
+					 add_commas (buffer, sizeof (buffer), (1UL<<IMEM_SIZE)));
+
+      (*d10v_callback->printf_filtered) (d10v_callback, "          %s bytes data memory.\n",
+					 add_commas (buffer, sizeof (buffer), (1UL<<IMEM_SIZE)));
+    }
+#endif
+}
+
+/* Transfer data to/from simulated memory.  Since a bug in either the
+   simulated program or in gdb or the simulator itself may cause a
+   bogus address to be passed in, we need to do some sanity checking
+   on addresses to make sure they are within bounds.  When an address
+   fails the bounds check, treat it as a zero length read/write rather
+   than aborting the entire run. */
+
+static int
+xfer_mem (SIM_ADDR addr,
+	  unsigned char *buffer,
+	  int size,
+	  int write_p)
+{
+  unsigned char *memory;
+  int segment = ((addr >> 24) & 0xff);
+  addr = (addr & 0x00ffffff);
+
+#ifdef DEBUG
+  if ((d10v_debug & DEBUG_INSTRUCTION) != 0)
+    {
+      if (write_p)
+	{
+	  (*d10v_callback->printf_filtered) (d10v_callback, "sim_write %d bytes to 0x%02x:%06x\n", size, segment, addr);
+	}
+      else
+	{
+	  (*d10v_callback->printf_filtered) (d10v_callback, "sim_read %d bytes from 0x%2x:%6x\n", size, segment, addr);
+	}
+    }
+#endif
+
+  /* to access data, we use the following mapping 
+      0x00xxxxxx: Logical data address segment        (DMAP translated memory)
+      0x01xxxxxx: Logical instruction address segment (IMAP translated memory)
+      0x10xxxxxx: Physical data memory segment        (On-chip data memory)
+      0x11xxxxxx: Physical instruction memory segment (On-chip insn memory)
+      0x12xxxxxx: Phisical unified memory segment     (Unified memory)
+   */
+
+  switch (segment)
+    {
+    case 0x00: /* DMAP translated memory */
+      {
+	int byte;
+	for (byte = 0; byte < size; byte++)
+	  {
+	    uint8 *mem = dmem_addr (addr + byte);
+	    if (mem == NULL)
+	      return byte;
+	    else if (write_p)
+	      *mem = buffer[byte];
+	    else
+	      buffer[byte] = *mem;
+	  }
+	return byte;
+      }
+
+    case 0x01: /* IMAP translated memory */
+      {
+	int byte;
+	for (byte = 0; byte < size; byte++)
+	  {
+	    uint8 *mem = imem_addr (addr + byte);
+	    if (mem == NULL)
+	      return byte;
+	    else if (write_p)
+	      *mem = buffer[byte];
+	    else
+	      buffer[byte] = *mem;
+	  }
+	return byte;
+      }
+
+    case 0x10: /* On-chip data memory */
+      {
+	addr &= ((1 << DMEM_SIZE) - 1);
+	if ((addr + size) > (1 << DMEM_SIZE))
+	  {
+	    (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: data address 0x%x is outside range 0-0x%x.\n",
+					       addr + size - 1, (1 << DMEM_SIZE) - 1);
+	    return (0);
+	  }
+	memory = State.dmem + addr;
+	break;
+      }
+
+    case 0x11: /* On-chip insn memory */
+      {
+	addr &= ((1 << IMEM_SIZE) - 1);
+	if ((addr + size) > (1 << IMEM_SIZE))
+	  {
+	    (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: instruction address 0x%x is outside range 0-0x%x.\n",
+					       addr + size - 1, (1 << IMEM_SIZE) - 1);
+	    return (0);
+	  }
+	memory = State.imem + addr;
+	break;
+      }
+
+    case 0x12: /* Unified memory */
+      {
+	int startsegment, startoffset;	/* Segment and offset within segment where xfer starts */
+	int endsegment, endoffset;	/* Segment and offset within segment where xfer ends */
+	
+	startsegment = addr >> UMEM_SIZE;
+	startoffset = addr & ((1 << UMEM_SIZE) - 1);
+	endsegment = (addr + size) >> UMEM_SIZE;
+	endoffset = (addr + size) & ((1 << UMEM_SIZE) - 1);
+	
+	/* FIXME: We do not currently implement xfers across segments,
+           so detect this case and fail gracefully. */
+	
+	if ((startsegment != endsegment) && !((endsegment == (startsegment + 1)) && endoffset == 0))
+	  {
+	    (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: Unimplemented support for transfers across unified memory segment boundaries\n");
+	    return (0);
+	  }
+	if (!State.umem[startsegment])
+	  {
+#ifdef DEBUG
+	    if ((d10v_debug & DEBUG_MEMSIZE) != 0)
+	      {
+		(*d10v_callback->printf_filtered) (d10v_callback,"Allocating %s bytes unified memory to region %d\n",
+						   add_commas (buffer, sizeof (buffer), (1UL<<IMEM_SIZE)), startsegment);
+	      }
+#endif
+	    State.umem[startsegment] = (uint8 *)calloc(1,1<<UMEM_SIZE);
+	  }
+	if (!State.umem[startsegment])
+	  {
+	    (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: Memory allocation of 0x%x bytes failed.\n", 1<<UMEM_SIZE);
+	    return (0);
+	  }
+	memory = State.umem[startsegment] + startoffset;
+	break;
+      }
+
+    default:
+      {
+	(*d10v_callback->printf_filtered) (d10v_callback, "ERROR: address 0x%lx is not in valid range\n", (long) addr);
+ 	(*d10v_callback->printf_filtered) (d10v_callback, "0x00xxxxxx:  Logical data address segment		(DMAP translated memory)\n");
+ 	(*d10v_callback->printf_filtered) (d10v_callback, "0x01xxxxxx:  Logical instruction address segment	(IMAP translated memory)\n");
+ 	(*d10v_callback->printf_filtered) (d10v_callback, "0x10xxxxxx:  Physical data memory segment		(On-chip data memory)\n");
+ 	(*d10v_callback->printf_filtered) (d10v_callback, "0x11xxxxxx:  Physical instruction memory segment	(On-chip insn memory)\n");
+ 	(*d10v_callback->printf_filtered) (d10v_callback, "0x12xxxxxx:  Phisical unified memory segment		(Unified memory)\n");
+	return (0);
+      }
+    }
+
+  if (write_p)
+    {
+      memcpy (memory, buffer, size);
+    }
+  else
+    {
+      memcpy (buffer, memory, size);
+    }
+
+  return size;
+}
+
+
+int
+sim_write (sd, addr, buffer, size)
+     SIM_DESC sd;
+     SIM_ADDR addr;
+     unsigned char *buffer;
+     int size;
+{
+  /* FIXME: this should be performing a virtual transfer */
+  return xfer_mem( addr, buffer, size, 1);
+}
+
+int
+sim_read (sd, addr, buffer, size)
+     SIM_DESC sd;
+     SIM_ADDR addr;
+     unsigned char *buffer;
+     int size;
+{
+  /* FIXME: this should be performing a virtual transfer */
+  return xfer_mem( addr, buffer, size, 0);
+}
+
+
+SIM_DESC
+sim_open (kind, callback, abfd, argv)
+     SIM_OPEN_KIND kind;
+     host_callback *callback;
+     struct _bfd *abfd;
+     char **argv;
+{
+  struct simops *s;
+  struct hash_entry *h;
+  static int init_p = 0;
+  char **p;
+
+  sim_kind = kind;
+  d10v_callback = callback;
+  myname = argv[0];
+
+  for (p = argv + 1; *p; ++p)
+    {
+#ifdef DEBUG
+      if (strcmp (*p, "-t") == 0)
+	d10v_debug = DEBUG;
+      else
+#endif
+	(*d10v_callback->printf_filtered) (d10v_callback, "ERROR: unsupported option(s): %s\n",*p);
+    }
+  
+  /* put all the opcodes in the hash table */
+  if (!init_p++)
+    {
+      for (s = Simops; s->func; s++)
+	{
+	  h = &hash_table[hash(s->opcode,s->format)];
+      
+	  /* go to the last entry in the chain */
+	  while (h->next)
+	    h = h->next;
+
+	  if (h->ops)
+	    {
+	      h->next = (struct hash_entry *) calloc(1,sizeof(struct hash_entry));
+	      if (!h->next)
+		perror ("malloc failure");
+
+	      h = h->next;
+	    }
+	  h->ops = s;
+	  h->mask = s->mask;
+	  h->opcode = s->opcode;
+	  h->size = s->is_long;
+	}
+    }
+
+  /* reset the processor state */
+  if (!State.imem)
+    sim_size(1);
+  sim_create_inferior ((SIM_DESC) 1, NULL, NULL, NULL);
+
+  /* Fudge our descriptor.  */
+  return (SIM_DESC) 1;
+}
+
+
+void
+sim_close (sd, quitting)
+     SIM_DESC sd;
+     int quitting;
+{
+  if (prog_bfd != NULL && prog_bfd_was_opened_p)
+    {
+      bfd_close (prog_bfd);
+      prog_bfd = NULL;
+      prog_bfd_was_opened_p = 0;
+    }
+}
+
+void
+sim_set_profile (n)
+     int n;
+{
+  (*d10v_callback->printf_filtered) (d10v_callback, "sim_set_profile %d\n",n);
+}
+
+void
+sim_set_profile_size (n)
+     int n;
+{
+  (*d10v_callback->printf_filtered) (d10v_callback, "sim_set_profile_size %d\n",n);
+}
+
+
+uint8 *
+dmem_addr( addr )
+     uint32 addr;
+{
+  int seg;
+
+  addr &= 0xffff;
+
+  if (addr > 0xbfff)
+    {
+      if ( (addr & 0xfff0) != 0xff00)
+	{
+	  (*d10v_callback->printf_filtered) (d10v_callback, "Data address 0x%lx is in I/O space, pc = 0x%lx.\n",
+					     (long)addr, (long)decode_pc ());
+	  State.exception = SIGBUS;
+	}
+
+      return State.dmem + addr;
+    }
+  
+  if (addr > 0x7fff)
+    {
+      if (DMAP & 0x1000)
+	{
+	  /* instruction memory */
+ 	  return (DMAP & 0xf) * 0x4000 + State.imem + (addr - 0x8000);
+	}
+      else 
+	{
+	  /* unified memory */
+	  /* this is ugly because we allocate unified memory in 128K segments and */
+	  /* dmap addresses 16k segments */
+	  seg = (DMAP & 0x3ff) >> 3;
+	  if (State.umem[seg] == NULL)
+	    {
+#ifdef DEBUG
+	      (*d10v_callback->printf_filtered) (d10v_callback,"Allocating %d bytes unified memory to region %d\n", 1<<UMEM_SIZE, seg);
+#endif
+	      State.umem[seg] = (uint8 *)calloc(1,1<<UMEM_SIZE);
+	      if (!State.umem[seg])
+		{
+		  (*d10v_callback->printf_filtered) (d10v_callback, 
+		      "ERROR:  alloc failed. unified memory region %d unmapped, pc = 0x%lx\n", 
+		      seg, (long)decode_pc ());
+		  State.exception = SIGBUS;
+		}
+	    }
+	  return State.umem[seg] + (DMAP & 7) * 0x4000 + (addr - 0x8000);
+	}
+    }
+  return State.dmem + addr;
+}
+
+
+uint8 *
+imem_addr (uint32 pc)
+{
+  uint16 imap;
+
+  if (pc & 0x20000)
+    imap = IMAP1;
+  else
+    imap = IMAP0;
+  
+  if (imap & 0x1000)
+    return State.imem + pc;
+
+  if (State.umem[imap & 0xff] == NULL)
+    return 0;
+
+  /* Discard upper bit(s) of PC in case IMAP1 selects unified memory. */
+  pc &= (1 << UMEM_SIZE) - 1;
+
+  return State.umem[imap & 0xff] + pc;
+}
+
+
+static int stop_simulator = 0;
+
+int
+sim_stop (sd)
+     SIM_DESC sd;
+{
+  stop_simulator = 1;
+  return 1;
+}
+
+
+/* Run (or resume) the program.  */
+void
+sim_resume (sd, step, siggnal)
+     SIM_DESC sd;
+     int step, siggnal;
+{
+  uint32 inst;
+  uint8 *iaddr;
+
+/*   (*d10v_callback->printf_filtered) (d10v_callback, "sim_resume (%d,%d)  PC=0x%x\n",step,siggnal,PC); */
+  State.exception = 0;
+  if (step)
+    sim_stop (sd);
+
+  do
+    {
+      iaddr = imem_addr ((uint32)PC << 2);
+      if (iaddr == NULL)
+ 	{
+ 	  State.exception = SIGBUS;
+ 	  break;
+ 	}
+ 
+      inst = get_longword( iaddr ); 
+ 
+      State.pc_changed = 0;
+      ins_type_counters[ (int)INS_CYCLES ]++;
+      
+      switch (inst & 0xC0000000)
+	{
+	case 0xC0000000:
+	  /* long instruction */
+	  do_long (inst & 0x3FFFFFFF);
+	  break;
+	case 0x80000000:
+	  /* R -> L */
+	  do_2_short ( inst & 0x7FFF, (inst & 0x3FFF8000) >> 15, RIGHT_FIRST);
+	  break;
+	case 0x40000000:
+	  /* L -> R */
+	  do_2_short ((inst & 0x3FFF8000) >> 15, inst & 0x7FFF, LEFT_FIRST);
+	  break;
+	case 0:
+	  do_parallel ((inst & 0x3FFF8000) >> 15, inst & 0x7FFF);
+	  break;
+	}
+      
+      /* If the PC of the current instruction matches RPT_E then
+	 schedule a branch to the loop start.  If one of those
+	 instructions happens to be a branch, than that instruction
+	 will be ignored */
+      if (!State.pc_changed)
+	{
+	  if (PSW_RP && PC == RPT_E)
+	    {
+	      /* Note: The behavour of a branch instruction at RPT_E
+		 is implementation dependant, this simulator takes the
+		 branch.  Branching to RPT_E is valid, the instruction
+		 must be executed before the loop is taken.  */
+	      if (RPT_C == 1)
+		{
+		  SET_PSW_RP (0);
+		  SET_RPT_C (0);
+		  SET_PC (PC + 1);
+		}
+	      else
+		{
+		  SET_RPT_C (RPT_C - 1);
+		  SET_PC (RPT_S);
+		}
+	    }
+	  else
+	    SET_PC (PC + 1);
+	}	  
+      
+      /* Check for a breakpoint trap on this instruction.  This
+	 overrides any pending branches or loops */
+      if (PSW_DB && PC == IBA)
+	{
+	  SET_BPC (PC);
+	  SET_BPSW (PSW);
+	  SET_PSW (PSW & PSW_SM_BIT);
+	  SET_PC (SDBT_VECTOR_START);
+	}
+
+      /* Writeback all the DATA / PC changes */
+      SLOT_FLUSH ();
+
+    }
+  while ( !State.exception && !stop_simulator);
+  
+  if (step && !State.exception)
+    State.exception = SIGTRAP;
+}
+
+int
+sim_trace (sd)
+     SIM_DESC sd;
+{
+#ifdef DEBUG
+  d10v_debug = DEBUG;
+#endif
+  sim_resume (sd, 0, 0);
+  return 1;
+}
+
+void
+sim_info (sd, verbose)
+     SIM_DESC sd;
+     int verbose;
+{
+  char buf1[40];
+  char buf2[40];
+  char buf3[40];
+  char buf4[40];
+  char buf5[40];
+  unsigned long left		= ins_type_counters[ (int)INS_LEFT ] + ins_type_counters[ (int)INS_LEFT_COND_EXE ];
+  unsigned long left_nops	= ins_type_counters[ (int)INS_LEFT_NOPS ];
+  unsigned long left_parallel	= ins_type_counters[ (int)INS_LEFT_PARALLEL ];
+  unsigned long left_cond	= ins_type_counters[ (int)INS_LEFT_COND_TEST ];
+  unsigned long left_total	= left + left_parallel + left_cond + left_nops;
+
+  unsigned long right		= ins_type_counters[ (int)INS_RIGHT ] + ins_type_counters[ (int)INS_RIGHT_COND_EXE ];
+  unsigned long right_nops	= ins_type_counters[ (int)INS_RIGHT_NOPS ];
+  unsigned long right_parallel	= ins_type_counters[ (int)INS_RIGHT_PARALLEL ];
+  unsigned long right_cond	= ins_type_counters[ (int)INS_RIGHT_COND_TEST ];
+  unsigned long right_total	= right + right_parallel + right_cond + right_nops;
+
+  unsigned long unknown		= ins_type_counters[ (int)INS_UNKNOWN ];
+  unsigned long ins_long	= ins_type_counters[ (int)INS_LONG ];
+  unsigned long parallel	= ins_type_counters[ (int)INS_PARALLEL ];
+  unsigned long leftright	= ins_type_counters[ (int)INS_LEFTRIGHT ];
+  unsigned long rightleft	= ins_type_counters[ (int)INS_RIGHTLEFT ];
+  unsigned long cond_true	= ins_type_counters[ (int)INS_COND_TRUE ];
+  unsigned long cond_false	= ins_type_counters[ (int)INS_COND_FALSE ];
+  unsigned long cond_jump	= ins_type_counters[ (int)INS_COND_JUMP ];
+  unsigned long cycles		= ins_type_counters[ (int)INS_CYCLES ];
+  unsigned long total		= (unknown + left_total + right_total + ins_long);
+
+  int size			= strlen (add_commas (buf1, sizeof (buf1), total));
+  int parallel_size		= strlen (add_commas (buf1, sizeof (buf1),
+						      (left_parallel > right_parallel) ? left_parallel : right_parallel));
+  int cond_size			= strlen (add_commas (buf1, sizeof (buf1), (left_cond > right_cond) ? left_cond : right_cond));
+  int nop_size			= strlen (add_commas (buf1, sizeof (buf1), (left_nops > right_nops) ? left_nops : right_nops));
+  int normal_size		= strlen (add_commas (buf1, sizeof (buf1), (left > right) ? left : right));
+
+  (*d10v_callback->printf_filtered) (d10v_callback,
+				     "executed %*s left  instruction(s), %*s normal, %*s parallel, %*s EXExxx, %*s nops\n",
+				     size, add_commas (buf1, sizeof (buf1), left_total),
+				     normal_size, add_commas (buf2, sizeof (buf2), left),
+				     parallel_size, add_commas (buf3, sizeof (buf3), left_parallel),
+				     cond_size, add_commas (buf4, sizeof (buf4), left_cond),
+				     nop_size, add_commas (buf5, sizeof (buf5), left_nops));
+
+  (*d10v_callback->printf_filtered) (d10v_callback,
+				     "executed %*s right instruction(s), %*s normal, %*s parallel, %*s EXExxx, %*s nops\n",
+				     size, add_commas (buf1, sizeof (buf1), right_total),
+				     normal_size, add_commas (buf2, sizeof (buf2), right),
+				     parallel_size, add_commas (buf3, sizeof (buf3), right_parallel),
+				     cond_size, add_commas (buf4, sizeof (buf4), right_cond),
+				     nop_size, add_commas (buf5, sizeof (buf5), right_nops));
+
+  if (ins_long)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "executed %*s long instruction(s)\n",
+				       size, add_commas (buf1, sizeof (buf1), ins_long));
+
+  if (parallel)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "executed %*s parallel instruction(s)\n",
+				       size, add_commas (buf1, sizeof (buf1), parallel));
+
+  if (leftright)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "executed %*s instruction(s) encoded L->R\n",
+				       size, add_commas (buf1, sizeof (buf1), leftright));
+
+  if (rightleft)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "executed %*s instruction(s) encoded R->L\n",
+				       size, add_commas (buf1, sizeof (buf1), rightleft));
+
+  if (unknown)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "executed %*s unknown instruction(s)\n",
+				       size, add_commas (buf1, sizeof (buf1), unknown));
+
+  if (cond_true)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "executed %*s instruction(s) due to EXExxx condition being true\n",
+				       size, add_commas (buf1, sizeof (buf1), cond_true));
+
+  if (cond_false)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "skipped  %*s instruction(s) due to EXExxx condition being false\n",
+				       size, add_commas (buf1, sizeof (buf1), cond_false));
+
+  if (cond_jump)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "skipped  %*s instruction(s) due to conditional branch succeeding\n",
+				       size, add_commas (buf1, sizeof (buf1), cond_jump));
+
+  (*d10v_callback->printf_filtered) (d10v_callback,
+				     "executed %*s cycle(s)\n",
+				     size, add_commas (buf1, sizeof (buf1), cycles));
+
+  (*d10v_callback->printf_filtered) (d10v_callback,
+				     "executed %*s total instructions\n",
+				     size, add_commas (buf1, sizeof (buf1), total));
+}
+
+SIM_RC
+sim_create_inferior (sd, abfd, argv, env)
+     SIM_DESC sd;
+     struct _bfd *abfd;
+     char **argv;
+     char **env;
+{
+  bfd_vma start_address;
+
+  /* reset all state information */
+  memset (&State.regs, 0, (int)&State.imem - (int)&State.regs[0]);
+
+  if (argv)
+    {
+      /* a hack to set r0/r1 with argc/argv */
+      /* some high memory that won't be overwritten by the stack soon */
+      bfd_vma addr = 0x7C00;
+      int p = 20;
+      int i = 0;
+      while (argv[i])
+ 	{
+ 	  int size = strlen (argv[i]) + 1;
+ 	  SW (addr + 2*i, addr + p); 
+ 	  sim_write (sd, addr + 0, argv[i], size);
+ 	  p += size;
+ 	  i++;
+ 	}
+      SET_GPR (0, addr);
+      SET_GPR (1, i);
+    }
+
+  /* set PC */
+  if (abfd != NULL)
+    start_address = bfd_get_start_address (abfd);
+  else
+    start_address = 0xffc0 << 2;
+#ifdef DEBUG
+  if (d10v_debug)
+    (*d10v_callback->printf_filtered) (d10v_callback, "sim_create_inferior:  PC=0x%lx\n", (long) start_address);
+#endif
+  SET_CREG (PC_CR, start_address >> 2);
+
+  /* cpu resets imap0 to 0 and imap1 to 0x7f, but D10V-EVA board */
+  /* resets imap0 and imap1 to 0x1000. */
+  if (1)
+    {
+      SET_IMAP0 (0x0000);
+      SET_IMAP1 (0x007f);
+      SET_DMAP (0x0000);
+    }
+  else
+    {
+      SET_IMAP0 (0x1000);
+      SET_IMAP1 (0x1000);
+      SET_DMAP(0);
+    }
+
+  SLOT_FLUSH ();
+  return SIM_RC_OK;
+}
+
+
+void
+sim_set_callbacks (p)
+     host_callback *p;
+{
+  d10v_callback = p;
+}
+
+void
+sim_stop_reason (sd, reason, sigrc)
+     SIM_DESC sd;
+     enum sim_stop *reason;
+     int *sigrc;
+{
+/*   (*d10v_callback->printf_filtered) (d10v_callback, "sim_stop_reason:  PC=0x%x\n",PC<<2); */
+
+  switch (State.exception)
+    {
+    case SIG_D10V_STOP:			/* stop instruction */
+      *reason = sim_exited;
+      *sigrc = 0;
+      break;
+
+    case SIG_D10V_EXIT:			/* exit trap */
+      *reason = sim_exited;
+      *sigrc = GPR (0);
+      break;
+
+    default:				/* some signal */
+      *reason = sim_stopped;
+      if (stop_simulator && !State.exception)
+	*sigrc = SIGINT;
+      else
+	*sigrc = State.exception;
+      break;
+    }
+
+  stop_simulator = 0;
+}
+
+int
+sim_fetch_register (sd, rn, memory, length)
+     SIM_DESC sd;
+     int rn;
+     unsigned char *memory;
+     int length;
+{
+  if (rn > 34)
+    WRITE_64 (memory, ACC (rn-35));
+  else if (rn == 32)
+    WRITE_16 (memory, IMAP0);
+  else if (rn == 33)
+    WRITE_16 (memory, IMAP1);
+  else if (rn == 34)
+    WRITE_16 (memory, DMAP);
+  else if (rn >= 16)
+    WRITE_16 (memory, CREG (rn - 16));
+  else
+    WRITE_16 (memory, GPR (rn));
+  return -1;
+}
+ 
+int
+sim_store_register (sd, rn, memory, length)
+     SIM_DESC sd;
+     int rn;
+     unsigned char *memory;
+     int length;
+{
+  if (rn > 34)
+    SET_ACC (rn-35, READ_64 (memory) & MASK40);
+  else if (rn == 34)
+    SET_DMAP( READ_16(memory) );
+  else if (rn == 33)
+    SET_IMAP1( READ_16(memory) );
+  else if (rn == 32)
+    SET_IMAP0( READ_16(memory) );
+  else if (rn >= 16)
+    SET_CREG (rn - 16, READ_16 (memory));
+  else
+    SET_GPR (rn, READ_16 (memory));
+  SLOT_FLUSH ();
+  return -1;
+}
+
+
+void
+sim_do_command (sd, cmd)
+     SIM_DESC sd;
+     char *cmd;
+{ 
+  (*d10v_callback->printf_filtered) (d10v_callback, "sim_do_command: %s\n",cmd);
+}
+
+SIM_RC
+sim_load (sd, prog, abfd, from_tty)
+     SIM_DESC sd;
+     char *prog;
+     bfd *abfd;
+     int from_tty;
+{
+  extern bfd *sim_load_file (); /* ??? Don't know where this should live.  */
+
+  if (prog_bfd != NULL && prog_bfd_was_opened_p)
+    {
+      bfd_close (prog_bfd);
+      prog_bfd_was_opened_p = 0;
+    }
+  prog_bfd = sim_load_file (sd, myname, d10v_callback, prog, abfd,
+			    sim_kind == SIM_OPEN_DEBUG,
+			    1/*LMA*/, sim_write);
+  if (prog_bfd == NULL)
+    return SIM_RC_FAIL;
+  prog_bfd_was_opened_p = abfd == NULL;
+  return SIM_RC_OK;
+} 
diff --git a/sim/d10v/simops.c b/sim/d10v/simops.c
new file mode 100644
index 0000000..c64ba42
--- /dev/null
+++ b/sim/d10v/simops.c
@@ -0,0 +1,3252 @@
+#include "config.h"
+
+#include <signal.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#include "d10v_sim.h"
+#include "simops.h"
+#include "targ-vals.h"
+
+extern char *strrchr ();
+
+enum op_types {
+  OP_VOID,
+  OP_REG,
+  OP_REG_OUTPUT,
+  OP_DREG,
+  OP_DREG_OUTPUT,
+  OP_ACCUM,
+  OP_ACCUM_OUTPUT,
+  OP_ACCUM_REVERSE,
+  OP_CR,
+  OP_CR_OUTPUT,
+  OP_CR_REVERSE,
+  OP_FLAG,
+  OP_FLAG_OUTPUT,
+  OP_CONSTANT16,
+  OP_CONSTANT8,
+  OP_CONSTANT3,
+  OP_CONSTANT4,
+  OP_MEMREF,
+  OP_MEMREF2,
+  OP_POSTDEC,
+  OP_POSTINC,
+  OP_PREDEC,
+  OP_R0,
+  OP_R1,
+  OP_R2,
+};
+
+
+enum {
+  PSW_MASK = (PSW_SM_BIT
+	      | PSW_EA_BIT
+	      | PSW_DB_BIT
+	      | PSW_DM_BIT
+	      | PSW_IE_BIT
+	      | PSW_RP_BIT
+	      | PSW_MD_BIT
+	      | PSW_FX_BIT
+	      | PSW_ST_BIT
+	      | PSW_F0_BIT
+	      | PSW_F1_BIT
+	      | PSW_C_BIT),
+};
+
+reg_t
+move_to_cr (int cr, reg_t mask, reg_t val)
+{
+  /* A MASK bit is set when the corresponding bit in the CR should
+     be left alone */
+  /* This assumes that (VAL & MASK) == 0 */
+  switch (cr)
+    {
+    case PSW_CR:
+      val &= PSW_MASK;
+      if ((mask & PSW_SM_BIT) == 0)
+	{
+	  int new_sm = (val & PSW_SM_BIT) != 0;
+	  SET_HELD_SP (PSW_SM, GPR (SP_IDX)); /* save old SP */
+	  if (PSW_SM != new_sm)
+	    SET_GPR (SP_IDX, HELD_SP (new_sm)); /* restore new SP */
+	}
+      if ((mask & (PSW_ST_BIT | PSW_FX_BIT)) == 0)
+	{
+	  if (val & PSW_ST_BIT && !(val & PSW_FX_BIT))
+	    {
+	      (*d10v_callback->printf_filtered)
+		(d10v_callback,
+		 "ERROR at PC 0x%x: ST can only be set when FX is set.\n",
+		 PC<<2);
+	      State.exception = SIGILL;
+	    }
+	}
+      /* keep an up-to-date psw around for tracing */
+      State.trace.psw = (State.trace.psw & mask) | val;
+      break;
+    case BPSW_CR:
+    case DPSW_CR:
+      val &= PSW_MASK;
+      break;
+    case MOD_S_CR:
+    case MOD_E_CR:
+      val &= ~1;
+      break;
+    default:
+      break;
+    }
+  /* only issue an update if the register is being changed */
+  if ((State.cregs[cr] & ~mask) != val)
+    SLOT_PEND_MASK (State.cregs[cr], mask, val);
+  return val;
+}
+
+#ifdef DEBUG
+static void trace_input_func PARAMS ((char *name,
+				      enum op_types in1,
+				      enum op_types in2,
+				      enum op_types in3));
+
+#define trace_input(name, in1, in2, in3) do { if (d10v_debug) trace_input_func (name, in1, in2, in3); } while (0)
+
+#ifndef SIZE_INSTRUCTION
+#define SIZE_INSTRUCTION 8
+#endif
+
+#ifndef SIZE_OPERANDS
+#define SIZE_OPERANDS 18
+#endif
+
+#ifndef SIZE_VALUES
+#define SIZE_VALUES 13
+#endif
+
+#ifndef SIZE_LOCATION
+#define SIZE_LOCATION 20
+#endif
+
+#ifndef SIZE_PC
+#define SIZE_PC 6
+#endif
+
+#ifndef SIZE_LINE_NUMBER
+#define SIZE_LINE_NUMBER 4
+#endif
+
+static void
+trace_input_func (name, in1, in2, in3)
+     char *name;
+     enum op_types in1;
+     enum op_types in2;
+     enum op_types in3;
+{
+  char *comma;
+  enum op_types in[3];
+  int i;
+  char buf[1024];
+  char *p;
+  long tmp;
+  char *type;
+  const char *filename;
+  const char *functionname;
+  unsigned int linenumber;
+  bfd_vma byte_pc;
+
+  if ((d10v_debug & DEBUG_TRACE) == 0)
+    return;
+
+  switch (State.ins_type)
+    {
+    default:
+    case INS_UNKNOWN:		type = " ?"; break;
+    case INS_LEFT:		type = " L"; break;
+    case INS_RIGHT:		type = " R"; break;
+    case INS_LEFT_PARALLEL:	type = "*L"; break;
+    case INS_RIGHT_PARALLEL:	type = "*R"; break;
+    case INS_LEFT_COND_TEST:	type = "?L"; break;
+    case INS_RIGHT_COND_TEST:	type = "?R"; break;
+    case INS_LEFT_COND_EXE:	type = "&L"; break;
+    case INS_RIGHT_COND_EXE:	type = "&R"; break;
+    case INS_LONG:		type = " B"; break;
+    }
+
+  if ((d10v_debug & DEBUG_LINE_NUMBER) == 0)
+    (*d10v_callback->printf_filtered) (d10v_callback,
+				       "0x%.*x %s: %-*s ",
+				       SIZE_PC, (unsigned)PC,
+				       type,
+				       SIZE_INSTRUCTION, name);
+
+  else
+    {
+      buf[0] = '\0';
+      byte_pc = decode_pc ();
+      if (text && byte_pc >= text_start && byte_pc < text_end)
+	{
+	  filename = (const char *)0;
+	  functionname = (const char *)0;
+	  linenumber = 0;
+	  if (bfd_find_nearest_line (prog_bfd, text, (struct symbol_cache_entry **)0, byte_pc - text_start,
+				     &filename, &functionname, &linenumber))
+	    {
+	      p = buf;
+	      if (linenumber)
+		{
+		  sprintf (p, "#%-*d ", SIZE_LINE_NUMBER, linenumber);
+		  p += strlen (p);
+		}
+	      else
+		{
+		  sprintf (p, "%-*s ", SIZE_LINE_NUMBER+1, "---");
+		  p += SIZE_LINE_NUMBER+2;
+		}
+
+	      if (functionname)
+		{
+		  sprintf (p, "%s ", functionname);
+		  p += strlen (p);
+		}
+	      else if (filename)
+		{
+		  char *q = strrchr (filename, '/');
+		  sprintf (p, "%s ", (q) ? q+1 : filename);
+		  p += strlen (p);
+		}
+
+	      if (*p == ' ')
+		*p = '\0';
+	    }
+	}
+
+      (*d10v_callback->printf_filtered) (d10v_callback,
+					 "0x%.*x %s: %-*.*s %-*s ",
+					 SIZE_PC, (unsigned)PC,
+					 type,
+					 SIZE_LOCATION, SIZE_LOCATION, buf,
+					 SIZE_INSTRUCTION, name);
+    }
+
+  in[0] = in1;
+  in[1] = in2;
+  in[2] = in3;
+  comma = "";
+  p = buf;
+  for (i = 0; i < 3; i++)
+    {
+      switch (in[i])
+	{
+	case OP_VOID:
+	case OP_R0:
+	case OP_R1:
+	case OP_R2:
+	  break;
+
+	case OP_REG:
+	case OP_REG_OUTPUT:
+	case OP_DREG:
+	case OP_DREG_OUTPUT:
+	  sprintf (p, "%sr%d", comma, OP[i]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_CR:
+	case OP_CR_OUTPUT:
+	case OP_CR_REVERSE:
+	  sprintf (p, "%scr%d", comma, OP[i]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_ACCUM:
+	case OP_ACCUM_OUTPUT:
+	case OP_ACCUM_REVERSE:
+	  sprintf (p, "%sa%d", comma, OP[i]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_CONSTANT16:
+	  sprintf (p, "%s%d", comma, OP[i]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_CONSTANT8:
+	  sprintf (p, "%s%d", comma, SEXT8(OP[i]));
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_CONSTANT4:
+	  sprintf (p, "%s%d", comma, SEXT4(OP[i]));
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_CONSTANT3:
+	  sprintf (p, "%s%d", comma, SEXT3(OP[i]));
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_MEMREF:
+	  sprintf (p, "%s@r%d", comma, OP[i]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_MEMREF2:
+	  sprintf (p, "%s@(%d,r%d)", comma, (int16)OP[i], OP[i+1]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_POSTINC:
+	  sprintf (p, "%s@r%d+", comma, OP[i]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_POSTDEC:
+	  sprintf (p, "%s@r%d-", comma, OP[i]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_PREDEC:
+	  sprintf (p, "%s@-r%d", comma, OP[i]);
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+
+	case OP_FLAG:
+	case OP_FLAG_OUTPUT:
+	  if (OP[i] == 0)
+	    sprintf (p, "%sf0", comma);
+
+	  else if (OP[i] == 1)
+	    sprintf (p, "%sf1", comma);
+
+	  else
+	    sprintf (p, "%sc", comma);
+
+	  p += strlen (p);
+	  comma = ",";
+	  break;
+	}
+    }
+
+  if ((d10v_debug & DEBUG_VALUES) == 0)
+    {
+      *p++ = '\n';
+      *p = '\0';
+      (*d10v_callback->printf_filtered) (d10v_callback, "%s", buf);
+    }
+  else
+    {
+      *p = '\0';
+      (*d10v_callback->printf_filtered) (d10v_callback, "%-*s", SIZE_OPERANDS, buf);
+
+      p = buf;
+      for (i = 0; i < 3; i++)
+	{
+	  buf[0] = '\0';
+	  switch (in[i])
+	    {
+	    case OP_VOID:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s", SIZE_VALUES, "");
+	      break;
+
+	    case OP_REG_OUTPUT:
+	    case OP_DREG_OUTPUT:
+	    case OP_CR_OUTPUT:
+	    case OP_ACCUM_OUTPUT:
+	    case OP_FLAG_OUTPUT:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s", SIZE_VALUES, "---");
+	      break;
+
+	    case OP_REG:
+	    case OP_MEMREF:
+	    case OP_POSTDEC:
+	    case OP_POSTINC:
+	    case OP_PREDEC:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16) GPR (OP[i]));
+	      break;
+
+	    case OP_DREG:
+	      tmp = (long)((((uint32) GPR (OP[i])) << 16) | ((uint32) GPR (OP[i] + 1)));
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.8lx", SIZE_VALUES-10, "", tmp);
+	      break;
+
+	    case OP_CR:
+	    case OP_CR_REVERSE:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16) CREG (OP[i]));
+	      break;
+
+	    case OP_ACCUM:
+	    case OP_ACCUM_REVERSE:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.2x%.8lx", SIZE_VALUES-12, "",
+						 ((int)(ACC (OP[i]) >> 32) & 0xff),
+						 ((unsigned long) ACC (OP[i])) & 0xffffffff);
+	      break;
+
+	    case OP_CONSTANT16:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16)OP[i]);
+	      break;
+
+	    case OP_CONSTANT4:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16)SEXT4(OP[i]));
+	      break;
+
+	    case OP_CONSTANT8:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16)SEXT8(OP[i]));
+	      break;
+
+	    case OP_CONSTANT3:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16)SEXT3(OP[i]));
+	      break;
+
+	    case OP_FLAG:
+	      if (OP[i] == 0)
+		(*d10v_callback->printf_filtered) (d10v_callback, "%*sF0 = %d", SIZE_VALUES-6, "",
+						   PSW_F0 != 0);
+
+	      else if (OP[i] == 1)
+		(*d10v_callback->printf_filtered) (d10v_callback, "%*sF1 = %d", SIZE_VALUES-6, "",
+						   PSW_F1 != 0);
+
+	      else
+		(*d10v_callback->printf_filtered) (d10v_callback, "%*sC = %d", SIZE_VALUES-5, "",
+						   PSW_C != 0);
+
+	      break;
+
+	    case OP_MEMREF2:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16)OP[i]);
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16)GPR (OP[i + 1]));
+	      i++;
+	      break;
+
+	    case OP_R0:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16) GPR (0));
+	      break;
+
+	    case OP_R1:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16) GPR (1));
+	      break;
+
+	    case OP_R2:
+	      (*d10v_callback->printf_filtered) (d10v_callback, "%*s0x%.4x", SIZE_VALUES-6, "",
+						 (uint16) GPR (2));
+	      break;
+
+	    }
+	}
+    }
+
+  (*d10v_callback->flush_stdout) (d10v_callback);
+}
+
+static void
+do_trace_output_flush (void)
+{
+  (*d10v_callback->flush_stdout) (d10v_callback);
+}
+
+static void
+do_trace_output_finish (void)
+{
+  (*d10v_callback->printf_filtered) (d10v_callback,
+				     " F0=%d F1=%d C=%d\n",
+				     (State.trace.psw & PSW_F0_BIT) != 0,
+				     (State.trace.psw & PSW_F1_BIT) != 0,
+				     (State.trace.psw & PSW_C_BIT) != 0);
+  (*d10v_callback->flush_stdout) (d10v_callback);
+}
+
+static void
+trace_output_40 (uint64 val)
+{
+  if ((d10v_debug & (DEBUG_TRACE | DEBUG_VALUES)) == (DEBUG_TRACE | DEBUG_VALUES))
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback,
+					 " :: %*s0x%.2x%.8lx",
+					 SIZE_VALUES - 12,
+					 "",
+					 ((int)(val >> 32) & 0xff),
+					 ((unsigned long) val) & 0xffffffff);
+      do_trace_output_finish ();
+    }
+}
+
+static void
+trace_output_32 (uint32 val)
+{
+  if ((d10v_debug & (DEBUG_TRACE | DEBUG_VALUES)) == (DEBUG_TRACE | DEBUG_VALUES))
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback,
+					 " :: %*s0x%.8x",
+					 SIZE_VALUES - 10,
+					 "",
+					 (int) val);
+      do_trace_output_finish ();
+    }
+}
+
+static void
+trace_output_16 (uint16 val)
+{
+  if ((d10v_debug & (DEBUG_TRACE | DEBUG_VALUES)) == (DEBUG_TRACE | DEBUG_VALUES))
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback,
+					 " :: %*s0x%.4x",
+					 SIZE_VALUES - 6,
+					 "",
+					 (int) val);
+      do_trace_output_finish ();
+    }
+}
+
+static void
+trace_output_void ()
+{
+  if ((d10v_debug & (DEBUG_TRACE | DEBUG_VALUES)) == (DEBUG_TRACE | DEBUG_VALUES))
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "\n");
+      do_trace_output_flush ();
+    }
+}
+
+static void
+trace_output_flag ()
+{
+  if ((d10v_debug & (DEBUG_TRACE | DEBUG_VALUES)) == (DEBUG_TRACE | DEBUG_VALUES))
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback,
+					 " :: %*s",
+					 SIZE_VALUES,
+					 "");
+      do_trace_output_finish ();
+    }
+}
+
+
+
+
+#else
+#define trace_input(NAME, IN1, IN2, IN3)
+#define trace_output(RESULT)
+#endif
+
+/* abs */
+void
+OP_4607 ()
+{
+  int16 tmp;
+  trace_input ("abs", OP_REG, OP_VOID, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  tmp = GPR(OP[0]);
+  if (tmp < 0)
+    {
+      tmp = - tmp;
+      SET_PSW_F0 (1);
+    }
+  else
+    SET_PSW_F0 (0);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* abs */
+void
+OP_5607 ()
+{
+  int64 tmp;
+  trace_input ("abs", OP_ACCUM, OP_VOID, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+
+  tmp = SEXT40 (ACC (OP[0]));
+  if (tmp < 0 )
+    {
+      tmp = - tmp;
+      if (PSW_ST)
+	{
+	  if (tmp > SEXT40(MAX32))
+	    tmp = (MAX32);
+	  else if (tmp < SEXT40(MIN32))
+	    tmp = (MIN32);
+	  else
+	    tmp = (tmp & MASK40);
+	}
+      else
+	tmp = (tmp & MASK40);
+      SET_PSW_F0 (1);
+    }
+  else
+    {
+      tmp = (tmp & MASK40);
+      SET_PSW_F0 (0);
+    }
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* add */
+void
+OP_200 ()
+{
+  uint16 a = GPR (OP[0]);
+  uint16 b = GPR (OP[1]);
+  uint16 tmp = (a + b);
+  trace_input ("add", OP_REG, OP_REG, OP_VOID);
+  SET_PSW_C (a > tmp);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* add */
+void
+OP_1201 ()
+{
+  int64 tmp;
+  tmp = SEXT40(ACC (OP[0])) + (SEXT16 (GPR (OP[1])) << 16 | GPR (OP[1] + 1));
+
+  trace_input ("add", OP_ACCUM, OP_REG, OP_VOID);
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* add */
+void
+OP_1203 ()
+{
+  int64 tmp;
+  tmp = SEXT40(ACC (OP[0])) + SEXT40(ACC (OP[1]));
+
+  trace_input ("add", OP_ACCUM, OP_ACCUM, OP_VOID);
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* add2w */
+void
+OP_1200 ()
+{
+  uint32 tmp;
+  uint32 a = (GPR (OP[0])) << 16 | GPR (OP[0] + 1);
+  uint32 b = (GPR (OP[1])) << 16 | GPR (OP[1] + 1);
+  trace_input ("add2w", OP_DREG, OP_DREG, OP_VOID);
+  tmp = a + b;
+  SET_PSW_C (tmp < a);
+  SET_GPR (OP[0] + 0, (tmp >> 16));
+  SET_GPR (OP[0] + 1, (tmp & 0xFFFF));
+  trace_output_32 (tmp);
+}
+
+/* add3 */
+void
+OP_1000000 ()
+{
+  uint16 a = GPR (OP[1]);
+  uint16 b = OP[2];
+  uint16 tmp = (a + b);
+  trace_input ("add3", OP_REG_OUTPUT, OP_REG, OP_CONSTANT16);
+  SET_PSW_C (tmp < a);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* addac3 */
+void
+OP_17000200 ()
+{
+  int64 tmp;
+  tmp = SEXT40(ACC (OP[2])) + SEXT40 ((GPR (OP[1]) << 16) | GPR (OP[1] + 1));
+
+  trace_input ("addac3", OP_DREG_OUTPUT, OP_DREG, OP_ACCUM);
+  SET_GPR (OP[0] + 0, ((tmp >> 16) & 0xffff));
+  SET_GPR (OP[0] + 1, (tmp & 0xffff));
+  trace_output_32 (tmp);
+}
+
+/* addac3 */
+void
+OP_17000202 ()
+{
+  int64 tmp;
+  tmp = SEXT40(ACC (OP[1])) + SEXT40(ACC (OP[2]));
+
+  trace_input ("addac3", OP_DREG_OUTPUT, OP_ACCUM, OP_ACCUM);
+  SET_GPR (OP[0] + 0, (tmp >> 16) & 0xffff);
+  SET_GPR (OP[0] + 1, tmp & 0xffff);
+  trace_output_32 (tmp);
+}
+
+/* addac3s */
+void
+OP_17001200 ()
+{
+  int64 tmp;
+  SET_PSW_F1 (PSW_F0);
+
+  trace_input ("addac3s", OP_DREG_OUTPUT, OP_DREG, OP_ACCUM);
+  tmp = SEXT40 (ACC (OP[2])) + SEXT40 ((GPR (OP[1]) << 16) | GPR (OP[1] + 1));
+  if (tmp > SEXT40(MAX32))
+    {
+      tmp = (MAX32);
+      SET_PSW_F0 (1);
+    }      
+  else if (tmp < SEXT40(MIN32))
+    {
+      tmp = (MIN32);
+      SET_PSW_F0 (1);
+    }      
+  else
+    {
+      SET_PSW_F0 (0);
+    }      
+  SET_GPR (OP[0] + 0, (tmp >> 16) & 0xffff);
+  SET_GPR (OP[0] + 1, (tmp & 0xffff));
+  trace_output_32 (tmp);
+}
+
+/* addac3s */
+void
+OP_17001202 ()
+{
+  int64 tmp;
+  SET_PSW_F1 (PSW_F0);
+
+  trace_input ("addac3s", OP_DREG_OUTPUT, OP_ACCUM, OP_ACCUM);
+  tmp = SEXT40(ACC (OP[1])) + SEXT40(ACC (OP[2]));
+  if (tmp > SEXT40(MAX32))
+    {
+      tmp = (MAX32);
+      SET_PSW_F0 (1);
+    }      
+  else if (tmp < SEXT40(MIN32))
+    {
+      tmp = (MIN32);
+      SET_PSW_F0 (1);
+    }      
+  else
+    {
+      SET_PSW_F0 (0);
+    }      
+  SET_GPR (OP[0] + 0, (tmp >> 16) & 0xffff);
+  SET_GPR (OP[0] + 1, (tmp & 0xffff));
+  trace_output_32 (tmp);
+}
+
+/* addi */
+void
+OP_201 ()
+{
+  uint16 a = GPR (OP[0]);
+  uint16 b;
+  uint16 tmp;
+  if (OP[1] == 0)
+    OP[1] = 16;
+  b = OP[1];
+  tmp = (a + b);
+  trace_input ("addi", OP_REG, OP_CONSTANT16, OP_VOID);
+  SET_PSW_C (tmp < a);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* and */
+void
+OP_C00 ()
+{
+  uint16 tmp = GPR (OP[0]) & GPR (OP[1]);
+  trace_input ("and", OP_REG, OP_REG, OP_VOID);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* and3 */
+void
+OP_6000000 ()
+{
+  uint16 tmp = GPR (OP[1]) & OP[2];
+  trace_input ("and3", OP_REG_OUTPUT, OP_REG, OP_CONSTANT16);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* bclri */
+void
+OP_C01 ()
+{
+  int16 tmp;
+  trace_input ("bclri", OP_REG, OP_CONSTANT16, OP_VOID);
+  tmp = (GPR (OP[0]) &~(0x8000 >> OP[1]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* bl.s */
+void
+OP_4900 ()
+{
+  trace_input ("bl.s", OP_CONSTANT8, OP_R0, OP_R1);
+  SET_GPR (13, PC + 1);
+  JMP( PC + SEXT8 (OP[0]));
+  trace_output_void ();
+}
+
+/* bl.l */
+void
+OP_24800000 ()
+{
+  trace_input ("bl.l", OP_CONSTANT16, OP_R0, OP_R1);
+  SET_GPR (13, (PC + 1));
+  JMP (PC + OP[0]);
+  trace_output_void ();
+}
+
+/* bnoti */
+void
+OP_A01 ()
+{
+  int16 tmp;
+  trace_input ("bnoti", OP_REG, OP_CONSTANT16, OP_VOID);
+  tmp = (GPR (OP[0]) ^ (0x8000 >> OP[1]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* bra.s */
+void
+OP_4800 ()
+{
+  trace_input ("bra.s", OP_CONSTANT8, OP_VOID, OP_VOID);
+  JMP (PC + SEXT8 (OP[0]));
+  trace_output_void ();
+}
+
+/* bra.l */
+void
+OP_24000000 ()
+{
+  trace_input ("bra.l", OP_CONSTANT16, OP_VOID, OP_VOID);
+  JMP (PC + OP[0]);
+  trace_output_void ();
+}
+
+/* brf0f.s */
+void
+OP_4A00 ()
+{
+  trace_input ("brf0f.s", OP_CONSTANT8, OP_VOID, OP_VOID);
+  if (!PSW_F0)
+    JMP (PC + SEXT8 (OP[0]));
+  trace_output_flag ();
+}
+
+/* brf0f.l */
+void
+OP_25000000 ()
+{
+  trace_input ("brf0f.l", OP_CONSTANT16, OP_VOID, OP_VOID);
+  if (!PSW_F0)
+    JMP (PC + OP[0]);
+  trace_output_flag ();
+}
+
+/* brf0t.s */
+void
+OP_4B00 ()
+{
+  trace_input ("brf0t.s", OP_CONSTANT8, OP_VOID, OP_VOID);
+  if (PSW_F0)
+    JMP (PC + SEXT8 (OP[0]));
+  trace_output_flag ();
+}
+
+/* brf0t.l */
+void
+OP_25800000 ()
+{
+  trace_input ("brf0t.l", OP_CONSTANT16, OP_VOID, OP_VOID);
+  if (PSW_F0)
+    JMP (PC + OP[0]);
+  trace_output_flag ();
+}
+
+/* bseti */
+void
+OP_801 ()
+{
+  int16 tmp;
+  trace_input ("bseti", OP_REG, OP_CONSTANT16, OP_VOID);
+  tmp = (GPR (OP[0]) | (0x8000 >> OP[1]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* btsti */
+void
+OP_E01 ()
+{
+  trace_input ("btsti", OP_REG, OP_CONSTANT16, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 ((GPR (OP[0]) & (0x8000 >> OP[1])) ? 1 : 0);
+  trace_output_flag ();
+}
+
+/* clrac */
+void
+OP_5601 ()
+{
+  trace_input ("clrac", OP_ACCUM_OUTPUT, OP_VOID, OP_VOID);
+  SET_ACC (OP[0], 0);
+  trace_output_40 (0);
+}
+
+/* cmp */
+void
+OP_600 ()
+{
+  trace_input ("cmp", OP_REG, OP_REG, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 (((int16)(GPR (OP[0])) < (int16)(GPR (OP[1]))) ? 1 : 0);
+  trace_output_flag ();
+}
+
+/* cmp */
+void
+OP_1603 ()
+{
+  trace_input ("cmp", OP_ACCUM, OP_ACCUM, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 ((SEXT40(ACC (OP[0])) < SEXT40(ACC (OP[1]))) ? 1 : 0);
+  trace_output_flag ();
+}
+
+/* cmpeq */
+void
+OP_400 ()
+{
+  trace_input ("cmpeq", OP_REG, OP_REG, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 ((GPR (OP[0]) == GPR (OP[1])) ? 1 : 0);
+  trace_output_flag ();
+}
+
+/* cmpeq */
+void
+OP_1403 ()
+{
+  trace_input ("cmpeq", OP_ACCUM, OP_ACCUM, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 (((ACC (OP[0]) & MASK40) == (ACC (OP[1]) & MASK40)) ? 1 : 0);
+  trace_output_flag ();
+}
+
+/* cmpeqi.s */
+void
+OP_401 ()
+{
+  trace_input ("cmpeqi.s", OP_REG, OP_CONSTANT4, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 ((GPR (OP[0]) == (reg_t) SEXT4 (OP[1])) ? 1 : 0);  
+  trace_output_flag ();
+}
+
+/* cmpeqi.l */
+void
+OP_2000000 ()
+{
+  trace_input ("cmpeqi.l", OP_REG, OP_CONSTANT16, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 ((GPR (OP[0]) == (reg_t)OP[1]) ? 1 : 0);  
+  trace_output_flag ();
+}
+
+/* cmpi.s */
+void
+OP_601 ()
+{
+  trace_input ("cmpi.s", OP_REG, OP_CONSTANT4, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 (((int16)(GPR (OP[0])) < (int16)SEXT4(OP[1])) ? 1 : 0);  
+  trace_output_flag ();
+}
+
+/* cmpi.l */
+void
+OP_3000000 ()
+{
+  trace_input ("cmpi.l", OP_REG, OP_CONSTANT16, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 (((int16)(GPR (OP[0])) < (int16)(OP[1])) ? 1 : 0);  
+  trace_output_flag ();
+}
+
+/* cmpu */
+void
+OP_4600 ()
+{
+  trace_input ("cmpu", OP_REG, OP_REG, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 ((GPR (OP[0]) < GPR (OP[1])) ? 1 : 0);  
+  trace_output_flag ();
+}
+
+/* cmpui */
+void
+OP_23000000 ()
+{
+  trace_input ("cmpui", OP_REG, OP_CONSTANT16, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 ((GPR (OP[0]) < (reg_t)OP[1]) ? 1 : 0);  
+  trace_output_flag ();
+}
+
+/* cpfg */
+void
+OP_4E09 ()
+{
+  uint8 val;
+  
+  trace_input ("cpfg", OP_FLAG_OUTPUT, OP_FLAG, OP_VOID);
+  
+  if (OP[1] == 0)
+    val = PSW_F0;
+  else if (OP[1] == 1)
+    val = PSW_F1;
+  else
+    val = PSW_C;
+  if (OP[0] == 0)
+    SET_PSW_F0 (val);
+  else
+    SET_PSW_F1 (val);
+
+  trace_output_flag ();
+}
+
+/* dbt */
+void
+OP_5F20 ()
+{
+  /* d10v_callback->printf_filtered(d10v_callback, "***** DBT *****  PC=%x\n",PC); */
+
+  /* GDB uses the instruction pair ``dbt || nop'' as a break-point.
+     The conditional below is for either of the instruction pairs
+     ``dbt -> XXX'' or ``dbt <- XXX'' and treats them as as cases
+     where the dbt instruction should be interpreted.
+
+     The module `sim-break' provides a more effective mechanism for
+     detecting GDB planted breakpoints.  The code below may,
+     eventually, be changed to use that mechanism. */
+
+  if (State.ins_type == INS_LEFT
+      || State.ins_type == INS_RIGHT)
+    {
+      trace_input ("dbt", OP_VOID, OP_VOID, OP_VOID);
+      SET_DPC (PC + 1);
+      SET_DPSW (PSW);
+      SET_PSW (PSW_DM_BIT | (PSW & (PSW_F0_BIT | PSW_F1_BIT | PSW_C_BIT)));
+      JMP (DBT_VECTOR_START);
+      trace_output_void ();
+    }
+  else
+    {
+      State.exception = SIGTRAP;
+    }
+}
+
+/* divs */
+void
+OP_14002800 ()
+{
+  uint16 foo, tmp, tmpf;
+  uint16 hi;
+  uint16 lo;
+
+  trace_input ("divs", OP_DREG, OP_REG, OP_VOID);
+  foo = (GPR (OP[0]) << 1) | (GPR (OP[0] + 1) >> 15);
+  tmp = (int16)foo - (int16)(GPR (OP[1]));
+  tmpf = (foo >= GPR (OP[1])) ? 1 : 0;
+  hi = ((tmpf == 1) ? tmp : foo);
+  lo = ((GPR (OP[0] + 1) << 1) | tmpf);
+  SET_GPR (OP[0] + 0, hi);
+  SET_GPR (OP[0] + 1, lo);
+  trace_output_32 (((uint32) hi << 16) | lo);
+}
+
+/* exef0f */
+void
+OP_4E04 ()
+{
+  trace_input ("exef0f", OP_VOID, OP_VOID, OP_VOID);
+  State.exe = (PSW_F0 == 0);
+  trace_output_flag ();
+}
+
+/* exef0t */
+void
+OP_4E24 ()
+{
+  trace_input ("exef0t", OP_VOID, OP_VOID, OP_VOID);
+  State.exe = (PSW_F0 != 0);
+  trace_output_flag ();
+}
+
+/* exef1f */
+void
+OP_4E40 ()
+{
+  trace_input ("exef1f", OP_VOID, OP_VOID, OP_VOID);
+  State.exe = (PSW_F1 == 0);
+  trace_output_flag ();
+}
+
+/* exef1t */
+void
+OP_4E42 ()
+{
+  trace_input ("exef1t", OP_VOID, OP_VOID, OP_VOID);
+  State.exe = (PSW_F1 != 0);
+  trace_output_flag ();
+}
+
+/* exefaf */
+void
+OP_4E00 ()
+{
+  trace_input ("exefaf", OP_VOID, OP_VOID, OP_VOID);
+  State.exe = (PSW_F0 == 0) & (PSW_F1 == 0);
+  trace_output_flag ();
+}
+
+/* exefat */
+void
+OP_4E02 ()
+{
+  trace_input ("exefat", OP_VOID, OP_VOID, OP_VOID);
+  State.exe = (PSW_F0 == 0) & (PSW_F1 != 0);
+  trace_output_flag ();
+}
+
+/* exetaf */
+void
+OP_4E20 ()
+{
+  trace_input ("exetaf", OP_VOID, OP_VOID, OP_VOID);
+  State.exe = (PSW_F0 != 0) & (PSW_F1 == 0);
+  trace_output_flag ();
+}
+
+/* exetat */
+void
+OP_4E22 ()
+{
+  trace_input ("exetat", OP_VOID, OP_VOID, OP_VOID);
+  State.exe = (PSW_F0 != 0) & (PSW_F1 != 0);
+  trace_output_flag ();
+}
+
+/* exp */
+void
+OP_15002A00 ()
+{
+  uint32 tmp, foo;
+  int i;
+
+  trace_input ("exp", OP_REG_OUTPUT, OP_DREG, OP_VOID);
+  if (((int16)GPR (OP[1])) >= 0)
+    tmp = (GPR (OP[1]) << 16) | GPR (OP[1] + 1);
+  else
+    tmp = ~((GPR (OP[1]) << 16) | GPR (OP[1] + 1));
+  
+  foo = 0x40000000;
+  for (i=1;i<17;i++)
+    {
+      if (tmp & foo)
+	{
+	  SET_GPR (OP[0], (i - 1));
+	  trace_output_16 (i - 1);
+	  return;
+	}
+      foo >>= 1;
+    }
+  SET_GPR (OP[0], 16);
+  trace_output_16 (16);
+}
+
+/* exp */
+void
+OP_15002A02 ()
+{
+  int64 tmp, foo;
+  int i;
+
+  trace_input ("exp", OP_REG_OUTPUT, OP_ACCUM, OP_VOID);
+  tmp = SEXT40(ACC (OP[1]));
+  if (tmp < 0)
+    tmp = ~tmp & MASK40;
+  
+  foo = 0x4000000000LL;
+  for (i=1;i<25;i++)
+    {
+      if (tmp & foo)
+	{
+	  SET_GPR (OP[0], i - 9);
+	  trace_output_16 (i - 9);
+	  return;
+	}
+      foo >>= 1;
+    }
+  SET_GPR (OP[0], 16);
+  trace_output_16 (16);
+}
+
+/* jl */
+void
+OP_4D00 ()
+{
+  trace_input ("jl", OP_REG, OP_R0, OP_R1);
+  SET_GPR (13, PC + 1);
+  JMP (GPR (OP[0]));
+  trace_output_void ();
+}
+
+/* jmp */
+void
+OP_4C00 ()
+{
+  trace_input ("jmp", OP_REG,
+	       (OP[0] == 13) ? OP_R0 : OP_VOID,
+	       (OP[0] == 13) ? OP_R1 : OP_VOID);
+
+  JMP (GPR (OP[0]));
+  trace_output_void ();
+}
+
+/* ld */
+void
+OP_30000000 ()
+{
+  uint16 tmp;
+  trace_input ("ld", OP_REG_OUTPUT, OP_MEMREF2, OP_VOID);
+  tmp = RW (OP[1] + GPR (OP[2]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* ld */
+void
+OP_6401 ()
+{
+  uint16 tmp;
+  trace_input ("ld", OP_REG_OUTPUT, OP_POSTDEC, OP_VOID);
+  tmp = RW (GPR (OP[1]));
+  SET_GPR (OP[0], tmp);
+  if (OP[0] != OP[1])
+    INC_ADDR (OP[1], -2);
+  trace_output_16 (tmp);
+}
+
+/* ld */
+void
+OP_6001 ()
+{
+  uint16 tmp;
+  trace_input ("ld", OP_REG_OUTPUT, OP_POSTINC, OP_VOID);
+  tmp = RW (GPR (OP[1]));
+  SET_GPR (OP[0], tmp);
+  if (OP[0] != OP[1])
+    INC_ADDR (OP[1], 2);
+  trace_output_16 (tmp);
+}
+
+/* ld */
+void
+OP_6000 ()
+{
+  uint16 tmp;
+  trace_input ("ld", OP_REG_OUTPUT, OP_MEMREF, OP_VOID);
+  tmp = RW (GPR (OP[1]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* ld2w */
+void
+OP_31000000 ()
+{
+  int32 tmp;
+  uint16 addr = GPR (OP[2]);
+  trace_input ("ld2w", OP_REG_OUTPUT, OP_MEMREF2, OP_VOID);
+  tmp = RLW (OP[1] + addr);
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* ld2w */
+void
+OP_6601 ()
+{
+  uint16 addr = GPR (OP[1]);
+  int32 tmp;
+  trace_input ("ld2w", OP_REG_OUTPUT, OP_POSTDEC, OP_VOID);
+  tmp = RLW (addr);
+  SET_GPR32 (OP[0], tmp);
+  INC_ADDR (OP[1], -4);
+  trace_output_32 (tmp);
+}
+
+/* ld2w */
+void
+OP_6201 ()
+{
+  int32 tmp;
+  uint16 addr = GPR (OP[1]);
+  trace_input ("ld2w", OP_REG_OUTPUT, OP_POSTINC, OP_VOID);
+  tmp = RLW (addr);
+  SET_GPR32 (OP[0], tmp);
+  INC_ADDR (OP[1], 4);
+  trace_output_32 (tmp);
+}
+
+/* ld2w */
+void
+OP_6200 ()
+{
+  uint16 addr = GPR (OP[1]);
+  int32 tmp;
+  trace_input ("ld2w", OP_REG_OUTPUT, OP_MEMREF, OP_VOID);
+  tmp = RLW (addr + 0);
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* ldb */
+void
+OP_38000000 ()
+{
+  int16 tmp;
+  trace_input ("ldb", OP_REG_OUTPUT, OP_MEMREF2, OP_VOID);
+  tmp = SEXT8 (RB (OP[1] + GPR (OP[2])));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* ldb */
+void
+OP_7000 ()
+{
+  int16 tmp;
+  trace_input ("ldb", OP_REG_OUTPUT, OP_MEMREF, OP_VOID);
+  tmp = SEXT8 (RB (GPR (OP[1])));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* ldi.s */
+void
+OP_4001 ()
+{
+  int16 tmp;
+  trace_input ("ldi.s", OP_REG_OUTPUT, OP_CONSTANT4, OP_VOID);
+  tmp = SEXT4 (OP[1]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* ldi.l */
+void
+OP_20000000 ()
+{
+  int16 tmp;
+  trace_input ("ldi.l", OP_REG_OUTPUT, OP_CONSTANT16, OP_VOID);
+  tmp = OP[1];
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* ldub */
+void
+OP_39000000 ()
+{
+  int16 tmp;
+  trace_input ("ldub", OP_REG_OUTPUT, OP_MEMREF2, OP_VOID);
+  tmp = RB (OP[1] + GPR (OP[2]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* ldub */
+void
+OP_7200 ()
+{
+  int16 tmp;
+  trace_input ("ldub", OP_REG_OUTPUT, OP_MEMREF, OP_VOID);
+  tmp = RB (GPR (OP[1]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* mac */
+void
+OP_2A00 ()
+{
+  int64 tmp;
+
+  trace_input ("mac", OP_ACCUM, OP_REG, OP_REG);
+  tmp = SEXT40 ((int16)(GPR (OP[1])) * (int16)(GPR (OP[2])));
+
+  if (PSW_FX)
+    tmp = SEXT40( (tmp << 1) & MASK40);
+
+  if (PSW_ST && tmp > SEXT40(MAX32))
+    tmp = (MAX32);
+
+  tmp += SEXT40 (ACC (OP[0]));
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* macsu */
+void
+OP_1A00 ()
+{
+  int64 tmp;
+
+  trace_input ("macsu", OP_ACCUM, OP_REG, OP_REG);
+  tmp = SEXT40 ((int16) GPR (OP[1]) * GPR (OP[2]));
+  if (PSW_FX)
+    tmp = SEXT40 ((tmp << 1) & MASK40);
+  tmp = ((SEXT40 (ACC (OP[0])) + tmp) & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* macu */
+void
+OP_3A00 ()
+{
+  uint64 tmp;
+  uint32 src1;
+  uint32 src2;
+
+  trace_input ("macu", OP_ACCUM, OP_REG, OP_REG);
+  src1 = (uint16) GPR (OP[1]);
+  src2 = (uint16) GPR (OP[2]);
+  tmp = src1 * src2;
+  if (PSW_FX)
+    tmp = (tmp << 1);
+  tmp = ((ACC (OP[0]) + tmp) & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* max */
+void
+OP_2600 ()
+{
+  int16 tmp;
+  trace_input ("max", OP_REG, OP_REG, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  if ((int16) GPR (OP[1]) > (int16)GPR (OP[0]))
+    {
+      tmp = GPR (OP[1]);
+      SET_PSW_F0 (1);
+    }
+  else
+    {
+      tmp = GPR (OP[0]);
+      SET_PSW_F0 (0);    
+    }
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* max */
+void
+OP_3600 ()
+{
+  int64 tmp;
+
+  trace_input ("max", OP_ACCUM, OP_DREG, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  tmp = SEXT16 (GPR (OP[1])) << 16 | GPR (OP[1] + 1);
+  if (tmp > SEXT40 (ACC (OP[0])))
+    {
+      tmp = (tmp & MASK40);
+      SET_PSW_F0 (1);
+    }
+  else
+    {
+      tmp = ACC (OP[0]);
+      SET_PSW_F0 (0);
+    }
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* max */
+void
+OP_3602 ()
+{
+  int64 tmp;
+  trace_input ("max", OP_ACCUM, OP_ACCUM, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  if (SEXT40 (ACC (OP[1])) > SEXT40 (ACC (OP[0])))
+    {
+      tmp = ACC (OP[1]);
+      SET_PSW_F0 (1);
+    }
+  else
+    {
+      tmp = ACC (OP[0]);
+      SET_PSW_F0 (0);
+    }
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+
+/* min */
+void
+OP_2601 ()
+{
+  int16 tmp;
+  trace_input ("min", OP_REG, OP_REG, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  if ((int16)GPR (OP[1]) < (int16)GPR (OP[0]))
+    {
+      tmp = GPR (OP[1]);
+      SET_PSW_F0 (1);
+    }
+  else
+    {
+      tmp = GPR (OP[0]);
+      SET_PSW_F0 (0);    
+    }
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* min */
+void
+OP_3601 ()
+{
+  int64 tmp;
+
+  trace_input ("min", OP_ACCUM, OP_DREG, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  tmp = SEXT16 (GPR (OP[1])) << 16 | GPR (OP[1] + 1);
+  if (tmp < SEXT40(ACC (OP[0])))
+    {
+      tmp = (tmp & MASK40);
+      SET_PSW_F0 (1);
+    }
+  else
+    {
+      tmp = ACC (OP[0]);
+      SET_PSW_F0 (0);
+    }
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* min */
+void
+OP_3603 ()
+{
+  int64 tmp;
+  trace_input ("min", OP_ACCUM, OP_ACCUM, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  if (SEXT40(ACC (OP[1])) < SEXT40(ACC (OP[0])))
+    {
+      tmp = ACC (OP[1]);
+      SET_PSW_F0 (1);
+    }
+  else
+    {
+      tmp = ACC (OP[0]);
+      SET_PSW_F0 (0);
+    }
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* msb */
+void
+OP_2800 ()
+{
+  int64 tmp;
+
+  trace_input ("msb", OP_ACCUM, OP_REG, OP_REG);
+  tmp = SEXT40 ((int16)(GPR (OP[1])) * (int16)(GPR (OP[2])));
+
+  if (PSW_FX)
+    tmp = SEXT40 ((tmp << 1) & MASK40);
+
+  if (PSW_ST && tmp > SEXT40(MAX32))
+    tmp = (MAX32);
+
+  tmp = SEXT40(ACC (OP[0])) - tmp;
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    {
+      tmp = (tmp & MASK40);
+    }
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* msbsu */
+void
+OP_1800 ()
+{
+  int64 tmp;
+
+  trace_input ("msbsu", OP_ACCUM, OP_REG, OP_REG);
+  tmp = SEXT40 ((int16)GPR (OP[1]) * GPR (OP[2]));
+  if (PSW_FX)
+    tmp = SEXT40( (tmp << 1) & MASK40);
+  tmp = ((SEXT40 (ACC (OP[0])) - tmp) & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* msbu */
+void
+OP_3800 ()
+{
+  uint64 tmp;
+  uint32 src1;
+  uint32 src2;
+
+  trace_input ("msbu", OP_ACCUM, OP_REG, OP_REG);
+  src1 = (uint16) GPR (OP[1]);
+  src2 = (uint16) GPR (OP[2]);
+  tmp = src1 * src2;
+  if (PSW_FX)
+    tmp = (tmp << 1);
+  tmp = ((ACC (OP[0]) - tmp) & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mul */
+void
+OP_2E00 ()
+{
+  int16 tmp;
+  trace_input ("mul", OP_REG, OP_REG, OP_VOID);
+  tmp = GPR (OP[0]) * GPR (OP[1]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* mulx */
+void
+OP_2C00 ()
+{
+  int64 tmp;
+
+  trace_input ("mulx", OP_ACCUM_OUTPUT, OP_REG, OP_REG);
+  tmp = SEXT40 ((int16)(GPR (OP[1])) * (int16)(GPR (OP[2])));
+
+  if (PSW_FX)
+    tmp = SEXT40 ((tmp << 1) & MASK40);
+
+  if (PSW_ST && tmp > SEXT40(MAX32))
+    tmp = (MAX32);
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mulxsu */
+void
+OP_1C00 ()
+{
+  int64 tmp;
+
+  trace_input ("mulxsu", OP_ACCUM_OUTPUT, OP_REG, OP_REG);
+  tmp = SEXT40 ((int16)(GPR (OP[1])) * GPR (OP[2]));
+
+  if (PSW_FX)
+    tmp <<= 1;
+  tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mulxu */
+void
+OP_3C00 ()
+{
+  uint64 tmp;
+  uint32 src1;
+  uint32 src2;
+
+  trace_input ("mulxu", OP_ACCUM_OUTPUT, OP_REG, OP_REG);
+  src1 = (uint16) GPR (OP[1]);
+  src2 = (uint16) GPR (OP[2]);
+  tmp = src1 * src2;
+  if (PSW_FX)
+    tmp <<= 1;
+  tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mv */
+void
+OP_4000 ()
+{
+  int16 tmp;
+  trace_input ("mv", OP_REG_OUTPUT, OP_REG, OP_VOID);
+  tmp = GPR (OP[1]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* mv2w */
+void
+OP_5000 ()
+{
+  int32 tmp;
+  trace_input ("mv2w", OP_DREG_OUTPUT, OP_DREG, OP_VOID);
+  tmp = GPR32 (OP[1]);
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* mv2wfac */
+void
+OP_3E00 ()
+{
+  int32 tmp;
+  trace_input ("mv2wfac", OP_DREG_OUTPUT, OP_ACCUM, OP_VOID);
+  tmp = ACC (OP[1]);
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* mv2wtac */
+void
+OP_3E01 ()
+{
+  int64 tmp;
+  trace_input ("mv2wtac", OP_DREG, OP_ACCUM_OUTPUT, OP_VOID);
+  tmp = ((SEXT16 (GPR (OP[0])) << 16 | GPR (OP[0] + 1)) & MASK40);
+  SET_ACC (OP[1], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mvac */
+void
+OP_3E03 ()
+{
+  int64 tmp;
+  trace_input ("mvac", OP_ACCUM_OUTPUT, OP_ACCUM, OP_VOID);
+  tmp = ACC (OP[1]);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mvb */
+void
+OP_5400 ()
+{
+  int16 tmp;
+  trace_input ("mvb", OP_REG_OUTPUT, OP_REG, OP_VOID);
+  tmp = SEXT8 (GPR (OP[1]) & 0xff);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* mvf0f */
+void
+OP_4400 ()
+{
+  int16 tmp;
+  trace_input ("mf0f", OP_REG_OUTPUT, OP_REG, OP_VOID);
+  if (PSW_F0 == 0)
+    {
+      tmp = GPR (OP[1]);
+      SET_GPR (OP[0], tmp);
+    }
+  else
+    tmp = GPR (OP[0]);
+  trace_output_16 (tmp);
+}
+
+/* mvf0t */
+void
+OP_4401 ()
+{
+  int16 tmp;
+  trace_input ("mf0t", OP_REG_OUTPUT, OP_REG, OP_VOID);
+  if (PSW_F0)
+    {
+      tmp = GPR (OP[1]);
+      SET_GPR (OP[0], tmp);
+    }
+  else
+    tmp = GPR (OP[0]);
+  trace_output_16 (tmp);
+}
+
+/* mvfacg */
+void
+OP_1E04 ()
+{
+  int16 tmp;
+  trace_input ("mvfacg", OP_REG_OUTPUT, OP_ACCUM, OP_VOID);
+  tmp = ((ACC (OP[1]) >> 32) & 0xff);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* mvfachi */
+void
+OP_1E00 ()
+{
+  int16 tmp;
+  trace_input ("mvfachi", OP_REG_OUTPUT, OP_ACCUM, OP_VOID);
+  tmp = (ACC (OP[1]) >> 16);  
+  SET_GPR (OP[0], tmp);  
+  trace_output_16 (tmp);
+}
+
+/* mvfaclo */
+void
+OP_1E02 ()
+{
+  int16 tmp;
+  trace_input ("mvfaclo", OP_REG_OUTPUT, OP_ACCUM, OP_VOID);
+  tmp = ACC (OP[1]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* mvfc */
+void
+OP_5200 ()
+{
+  int16 tmp;
+  trace_input ("mvfc", OP_REG_OUTPUT, OP_CR, OP_VOID);
+  tmp = CREG (OP[1]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* mvtacg */
+void
+OP_1E41 ()
+{
+  int64 tmp;
+  trace_input ("mvtacg", OP_REG, OP_ACCUM, OP_VOID);
+  tmp = ((ACC (OP[1]) & MASK32)
+	 | ((int64)(GPR (OP[0]) & 0xff) << 32));
+  SET_ACC (OP[1], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mvtachi */
+void
+OP_1E01 ()
+{
+  uint64 tmp;
+  trace_input ("mvtachi", OP_REG, OP_ACCUM, OP_VOID);
+  tmp = ACC (OP[1]) & 0xffff;
+  tmp = ((SEXT16 (GPR (OP[0])) << 16 | tmp) & MASK40);
+  SET_ACC (OP[1], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mvtaclo */
+void
+OP_1E21 ()
+{
+  int64 tmp;
+  trace_input ("mvtaclo", OP_REG, OP_ACCUM, OP_VOID);
+  tmp = ((SEXT16 (GPR (OP[0]))) & MASK40);
+  SET_ACC (OP[1], tmp);
+  trace_output_40 (tmp);
+}
+
+/* mvtc */
+void
+OP_5600 ()
+{
+  int16 tmp;
+  trace_input ("mvtc", OP_REG, OP_CR_OUTPUT, OP_VOID);
+  tmp = GPR (OP[0]);
+  tmp = SET_CREG (OP[1], tmp);
+  trace_output_16 (tmp);
+}
+
+/* mvub */
+void
+OP_5401 ()
+{
+  int16 tmp;
+  trace_input ("mvub", OP_REG_OUTPUT, OP_REG, OP_VOID);
+  tmp = (GPR (OP[1]) & 0xff);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* neg */
+void
+OP_4605 ()
+{
+  int16 tmp;
+  trace_input ("neg", OP_REG, OP_VOID, OP_VOID);
+  tmp = - GPR (OP[0]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* neg */
+void
+OP_5605 ()
+{
+  int64 tmp;
+
+  trace_input ("neg", OP_ACCUM, OP_VOID, OP_VOID);
+  tmp = -SEXT40(ACC (OP[0]));
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+
+/* nop */
+void
+OP_5E00 ()
+{
+  trace_input ("nop", OP_VOID, OP_VOID, OP_VOID);
+
+  ins_type_counters[ (int)State.ins_type ]--;	/* don't count nops as normal instructions */
+  switch (State.ins_type)
+    {
+    default:
+      ins_type_counters[ (int)INS_UNKNOWN ]++;
+      break;
+
+    case INS_LEFT_PARALLEL:
+      /* Don't count a parallel op that includes a NOP as a true parallel op */
+      ins_type_counters[ (int)INS_RIGHT_PARALLEL ]--;
+      ins_type_counters[ (int)INS_RIGHT ]++;
+      ins_type_counters[ (int)INS_LEFT_NOPS ]++;
+      break;
+
+    case INS_LEFT:
+    case INS_LEFT_COND_EXE:
+      ins_type_counters[ (int)INS_LEFT_NOPS ]++;
+      break;
+
+    case INS_RIGHT_PARALLEL:
+      /* Don't count a parallel op that includes a NOP as a true parallel op */
+      ins_type_counters[ (int)INS_LEFT_PARALLEL ]--;
+      ins_type_counters[ (int)INS_LEFT ]++;
+      ins_type_counters[ (int)INS_RIGHT_NOPS ]++;
+      break;
+
+    case INS_RIGHT:
+    case INS_RIGHT_COND_EXE:
+      ins_type_counters[ (int)INS_RIGHT_NOPS ]++;
+      break;
+    }
+
+  trace_output_void ();
+}
+
+/* not */
+void
+OP_4603 ()
+{
+  int16 tmp;
+  trace_input ("not", OP_REG, OP_VOID, OP_VOID);
+  tmp = ~GPR (OP[0]);  
+  SET_GPR (OP[0], tmp);  
+  trace_output_16 (tmp);
+}
+
+/* or */
+void
+OP_800 ()
+{
+  int16 tmp;
+  trace_input ("or", OP_REG, OP_REG, OP_VOID);
+  tmp = (GPR (OP[0]) | GPR (OP[1]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* or3 */
+void
+OP_4000000 ()
+{
+  int16 tmp;
+  trace_input ("or3", OP_REG_OUTPUT, OP_REG, OP_CONSTANT16);
+  tmp = (GPR (OP[1]) | OP[2]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* rac */
+void
+OP_5201 ()
+{
+  int64 tmp;
+  int shift = SEXT3 (OP[2]);
+
+  trace_input ("rac", OP_DREG_OUTPUT, OP_ACCUM, OP_CONSTANT3);
+  if (OP[1] != 0)
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback,
+					 "ERROR at PC 0x%x: instruction only valid for A0\n",
+					 PC<<2);
+      State.exception = SIGILL;
+    }
+
+  SET_PSW_F1 (PSW_F0);
+  tmp = SEXT56 ((ACC (0) << 16) | (ACC (1) & 0xffff));
+  if (shift >=0)
+    tmp <<= shift;
+  else
+    tmp >>= -shift;
+  tmp += 0x8000;
+  tmp >>= 16; /* look at bits 0:43 */
+  if (tmp > SEXT44 (SIGNED64 (0x0007fffffff)))
+    {
+      tmp = 0x7fffffff;
+      SET_PSW_F0 (1);
+    } 
+  else if (tmp < SEXT44 (SIGNED64 (0xfff80000000)))
+    {
+      tmp = 0x80000000;
+      SET_PSW_F0 (1);
+    } 
+  else
+    {
+      SET_PSW_F0 (0);
+    }
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* rachi */
+void
+OP_4201 ()
+{
+  signed64 tmp;
+  int shift = SEXT3 (OP[2]);
+
+  trace_input ("rachi", OP_REG_OUTPUT, OP_ACCUM, OP_CONSTANT3);
+  SET_PSW_F1 (PSW_F0);
+  if (shift >=0)
+    tmp = SEXT40 (ACC (OP[1])) << shift;
+  else
+    tmp = SEXT40 (ACC (OP[1])) >> -shift;
+  tmp += 0x8000;
+
+  if (tmp > SEXT44 (SIGNED64 (0x0007fffffff)))
+    {
+      tmp = 0x7fff;
+      SET_PSW_F0 (1);
+    }
+  else if (tmp < SEXT44 (SIGNED64 (0xfff80000000)))
+    {
+      tmp = 0x8000;
+      SET_PSW_F0 (1);
+    }
+  else
+    {
+      tmp = (tmp >> 16);
+      SET_PSW_F0 (0);
+    }
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* rep */
+void
+OP_27000000 ()
+{
+  trace_input ("rep", OP_REG, OP_CONSTANT16, OP_VOID);
+  SET_RPT_S (PC + 1);
+  SET_RPT_E (PC + OP[1]);
+  SET_RPT_C (GPR (OP[0]));
+  SET_PSW_RP (1);
+  if (GPR (OP[0]) == 0)
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: rep with count=0 is illegal.\n");
+      State.exception = SIGILL;
+    }
+  if (OP[1] < 4)
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: rep must include at least 4 instructions.\n");
+      State.exception = SIGILL;
+    }
+  trace_output_void ();
+}
+
+/* repi */
+void
+OP_2F000000 ()
+{
+  trace_input ("repi", OP_CONSTANT16, OP_CONSTANT16, OP_VOID);
+  SET_RPT_S (PC + 1);
+  SET_RPT_E (PC + OP[1]);
+  SET_RPT_C (OP[0]);
+  SET_PSW_RP (1);
+  if (OP[0] == 0)
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: repi with count=0 is illegal.\n");
+      State.exception = SIGILL;
+    }
+  if (OP[1] < 4)
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: repi must include at least 4 instructions.\n");
+      State.exception = SIGILL;
+    }
+  trace_output_void ();
+}
+
+/* rtd */
+void
+OP_5F60 ()
+{
+  trace_input ("rtd", OP_VOID, OP_VOID, OP_VOID);
+  SET_CREG (PSW_CR, DPSW);
+  JMP(DPC);
+  trace_output_void ();
+}
+
+/* rte */
+void
+OP_5F40 ()
+{
+  trace_input ("rte", OP_VOID, OP_VOID, OP_VOID);
+  SET_CREG (PSW_CR, BPSW);
+  JMP(BPC);
+  trace_output_void ();
+}
+
+/* sadd */
+void
+OP_1223 ()
+{
+  int64 tmp;
+
+  trace_input ("sadd", OP_ACCUM, OP_ACCUM, OP_VOID);
+  tmp = SEXT40(ACC (OP[0])) + (SEXT40(ACC (OP[1])) >> 16);
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* setf0f */
+void
+OP_4611 ()
+{
+  int16 tmp;
+  trace_input ("setf0f", OP_REG_OUTPUT, OP_VOID, OP_VOID);
+  tmp = ((PSW_F0 == 0) ? 1 : 0);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* setf0t */
+void
+OP_4613 ()
+{
+  int16 tmp;
+  trace_input ("setf0t", OP_REG_OUTPUT, OP_VOID, OP_VOID);
+  tmp = ((PSW_F0 == 1) ? 1 : 0);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* sleep */
+void
+OP_5FC0 ()
+{
+  trace_input ("sleep", OP_VOID, OP_VOID, OP_VOID);
+  SET_PSW_IE (1);
+  trace_output_void ();
+}
+
+/* sll */
+void
+OP_2200 ()
+{
+  int16 tmp;
+  trace_input ("sll", OP_REG, OP_REG, OP_VOID);
+  tmp = (GPR (OP[0]) << (GPR (OP[1]) & 0xf));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* sll */
+void
+OP_3200 ()
+{
+  int64 tmp;
+  trace_input ("sll", OP_ACCUM, OP_REG, OP_VOID);
+  if ((GPR (OP[1]) & 31) <= 16)
+    tmp = SEXT40 (ACC (OP[0])) << (GPR (OP[1]) & 31);
+  else
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: shift value %d too large.\n", GPR (OP[1]) & 31);
+      State.exception = SIGILL;
+      return;
+    }
+
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* slli */
+void
+OP_2201 ()
+{
+  int16 tmp;
+  trace_input ("slli", OP_REG, OP_CONSTANT16, OP_VOID);
+  tmp = (GPR (OP[0]) << OP[1]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* slli */
+void
+OP_3201 ()
+{
+  int64 tmp;
+
+  if (OP[1] == 0)
+    OP[1] = 16;
+
+  trace_input ("slli", OP_ACCUM, OP_CONSTANT16, OP_VOID);
+  tmp = SEXT40(ACC (OP[0])) << OP[1];
+
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* slx */
+void
+OP_460B ()
+{
+  int16 tmp;
+  trace_input ("slx", OP_REG, OP_FLAG, OP_VOID);
+  tmp = ((GPR (OP[0]) << 1) | PSW_F0);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* sra */
+void
+OP_2400 ()
+{
+  int16 tmp;
+  trace_input ("sra", OP_REG, OP_REG, OP_VOID);
+  tmp = (((int16)(GPR (OP[0]))) >> (GPR (OP[1]) & 0xf));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* sra */
+void
+OP_3400 ()
+{
+  trace_input ("sra", OP_ACCUM, OP_REG, OP_VOID);
+  if ((GPR (OP[1]) & 31) <= 16)
+    {
+      int64 tmp = ((SEXT40(ACC (OP[0])) >> (GPR (OP[1]) & 31)) & MASK40);
+      SET_ACC (OP[0], tmp);
+      trace_output_40 (tmp);
+    }
+  else
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: shift value %d too large.\n", GPR (OP[1]) & 31);
+      State.exception = SIGILL;
+      return;
+    }
+}
+
+/* srai */
+void
+OP_2401 ()
+{
+  int16 tmp;
+  trace_input ("srai", OP_REG, OP_CONSTANT16, OP_VOID);
+  tmp = (((int16)(GPR (OP[0]))) >> OP[1]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* srai */
+void
+OP_3401 ()
+{
+  int64 tmp;
+  if (OP[1] == 0)
+    OP[1] = 16;
+
+  trace_input ("srai", OP_ACCUM, OP_CONSTANT16, OP_VOID);
+  tmp = ((SEXT40(ACC (OP[0])) >> OP[1]) & MASK40);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* srl */
+void
+OP_2000 ()
+{
+  int16 tmp;
+  trace_input ("srl", OP_REG, OP_REG, OP_VOID);
+  tmp = (GPR (OP[0]) >>  (GPR (OP[1]) & 0xf));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* srl */
+void
+OP_3000 ()
+{
+  trace_input ("srl", OP_ACCUM, OP_REG, OP_VOID);
+  if ((GPR (OP[1]) & 31) <= 16)
+    {
+      int64 tmp = ((uint64)((ACC (OP[0]) & MASK40) >> (GPR (OP[1]) & 31)));
+      SET_ACC (OP[0], tmp);
+      trace_output_40 (tmp);
+    }
+  else
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: shift value %d too large.\n", GPR (OP[1]) & 31);
+      State.exception = SIGILL;
+      return;
+    }
+
+}
+
+/* srli */
+void
+OP_2001 ()
+{
+  int16 tmp;
+  trace_input ("srli", OP_REG, OP_CONSTANT16, OP_VOID);
+  tmp = (GPR (OP[0]) >> OP[1]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* srli */
+void
+OP_3001 ()
+{
+  int64 tmp;
+  if (OP[1] == 0)
+    OP[1] = 16;
+
+  trace_input ("srli", OP_ACCUM, OP_CONSTANT16, OP_VOID);
+  tmp = ((uint64)(ACC (OP[0]) & MASK40) >> OP[1]);
+  SET_ACC (OP[0], tmp);
+  trace_output_40 (tmp);
+}
+
+/* srx */
+void
+OP_4609 ()
+{
+  uint16 tmp;
+  trace_input ("srx", OP_REG, OP_FLAG, OP_VOID);
+  tmp = PSW_F0 << 15;
+  tmp = ((GPR (OP[0]) >> 1) | tmp);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* st */
+void
+OP_34000000 ()
+{
+  trace_input ("st", OP_REG, OP_MEMREF2, OP_VOID);
+  SW (OP[1] + GPR (OP[2]), GPR (OP[0]));
+  trace_output_void ();
+}
+
+/* st */
+void
+OP_6800 ()
+{
+  trace_input ("st", OP_REG, OP_MEMREF, OP_VOID);
+  SW (GPR (OP[1]), GPR (OP[0]));
+  trace_output_void ();
+}
+
+/* st */
+void
+OP_6C1F ()
+{
+  uint16 addr = GPR (OP[1]) - 2;
+  trace_input ("st", OP_REG, OP_PREDEC, OP_VOID);
+  if (OP[1] != 15)
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: cannot pre-decrement any registers but r15 (SP).\n");
+      State.exception = SIGILL;
+      return;
+    }
+  SW (addr, GPR (OP[0]));
+  SET_GPR (OP[1], addr);
+  trace_output_void ();
+}
+
+/* st */
+void
+OP_6801 ()
+{
+  trace_input ("st", OP_REG, OP_POSTINC, OP_VOID);
+  SW (GPR (OP[1]), GPR (OP[0]));
+  INC_ADDR (OP[1], 2);
+  trace_output_void ();
+}
+
+/* st */
+void
+OP_6C01 ()
+{
+  trace_input ("st", OP_REG, OP_POSTDEC, OP_VOID);
+  if ( OP[1] == 15 )
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: cannot post-decrement register r15 (SP).\n");
+      State.exception = SIGILL;
+      return;
+    }
+  SW (GPR (OP[1]), GPR (OP[0]));
+  INC_ADDR (OP[1], -2);
+  trace_output_void ();
+}
+
+/* st2w */
+void
+OP_35000000 ()
+{
+  trace_input ("st2w", OP_DREG, OP_MEMREF2, OP_VOID);
+  SW (GPR (OP[2])+ OP[1] + 0, GPR (OP[0] + 0));
+  SW (GPR (OP[2])+ OP[1] + 2, GPR (OP[0] + 1));
+  trace_output_void ();
+}
+
+/* st2w */
+void
+OP_6A00 ()
+{
+  trace_input ("st2w", OP_DREG, OP_MEMREF, OP_VOID);
+  SW (GPR (OP[1]) + 0, GPR (OP[0] + 0));
+  SW (GPR (OP[1]) + 2, GPR (OP[0] + 1));
+  trace_output_void ();
+}
+
+/* st2w */
+void
+OP_6E1F ()
+{
+  uint16 addr = GPR (OP[1]) - 4;
+  trace_input ("st2w", OP_DREG, OP_PREDEC, OP_VOID);
+  if ( OP[1] != 15 )
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: cannot pre-decrement any registers but r15 (SP).\n");
+      State.exception = SIGILL;
+      return;
+    }
+  SW (addr + 0, GPR (OP[0] + 0));
+  SW (addr + 2, GPR (OP[0] + 1));
+  SET_GPR (OP[1], addr);
+  trace_output_void ();
+}
+
+/* st2w */
+void
+OP_6A01 ()
+{
+  trace_input ("st2w", OP_DREG, OP_POSTINC, OP_VOID);
+  SW (GPR (OP[1]) + 0, GPR (OP[0] + 0));
+  SW (GPR (OP[1]) + 2, GPR (OP[0] + 1));
+  INC_ADDR (OP[1], 4);
+  trace_output_void ();
+}
+
+/* st2w */
+void
+OP_6E01 ()
+{
+  trace_input ("st2w", OP_DREG, OP_POSTDEC, OP_VOID);
+  if ( OP[1] == 15 )
+    {
+      (*d10v_callback->printf_filtered) (d10v_callback, "ERROR: cannot post-decrement register r15 (SP).\n");
+      State.exception = SIGILL;
+      return;
+    }
+  SW (GPR (OP[1]) + 0, GPR (OP[0] + 0));
+  SW (GPR (OP[1]) + 2, GPR (OP[0] + 1));
+  INC_ADDR (OP[1], -4);
+  trace_output_void ();
+}
+
+/* stb */
+void
+OP_3C000000 ()
+{
+  trace_input ("stb", OP_REG, OP_MEMREF2, OP_VOID);
+  SB (GPR (OP[2]) + OP[1], GPR (OP[0]));
+  trace_output_void ();
+}
+
+/* stb */
+void
+OP_7800 ()
+{
+  trace_input ("stb", OP_REG, OP_MEMREF, OP_VOID);
+  SB (GPR (OP[1]), GPR (OP[0]));
+  trace_output_void ();
+}
+
+/* stop */
+void
+OP_5FE0 ()
+{
+  trace_input ("stop", OP_VOID, OP_VOID, OP_VOID);
+  State.exception = SIG_D10V_STOP;
+  trace_output_void ();
+}
+
+/* sub */
+void
+OP_0 ()
+{
+  uint16 a = GPR (OP[0]);
+  uint16 b = GPR (OP[1]);
+  uint16 tmp = (a - b);
+  trace_input ("sub", OP_REG, OP_REG, OP_VOID);
+  /* see ../common/sim-alu.h for a more extensive discussion on how to
+     compute the carry/overflow bits. */
+  SET_PSW_C (a >= b);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* sub */
+void
+OP_1001 ()
+{
+  int64 tmp;
+
+  trace_input ("sub", OP_ACCUM, OP_DREG, OP_VOID);
+  tmp = SEXT40(ACC (OP[0])) - (SEXT16 (GPR (OP[1])) << 16 | GPR (OP[1] + 1));
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+
+  trace_output_40 (tmp);
+}
+
+/* sub */
+
+void
+OP_1003 ()
+{
+  int64 tmp;
+
+  trace_input ("sub", OP_ACCUM, OP_ACCUM, OP_VOID);
+  tmp = SEXT40(ACC (OP[0])) - SEXT40(ACC (OP[1]));
+  if (PSW_ST)
+    {
+      if (tmp > SEXT40(MAX32))
+	tmp = (MAX32);
+      else if (tmp < SEXT40(MIN32))
+	tmp = (MIN32);
+      else
+	tmp = (tmp & MASK40);
+    }
+  else
+    tmp = (tmp & MASK40);
+  SET_ACC (OP[0], tmp);
+
+  trace_output_40 (tmp);
+}
+
+/* sub2w */
+void
+OP_1000 ()
+{
+  uint32 tmp, a, b;
+
+  trace_input ("sub2w", OP_DREG, OP_DREG, OP_VOID);
+  a = (uint32)((GPR (OP[0]) << 16) | GPR (OP[0] + 1));
+  b = (uint32)((GPR (OP[1]) << 16) | GPR (OP[1] + 1));
+  /* see ../common/sim-alu.h for a more extensive discussion on how to
+     compute the carry/overflow bits */
+  tmp = a - b;
+  SET_PSW_C (a >= b);
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* subac3 */
+void
+OP_17000000 ()
+{
+  int64 tmp;
+
+  trace_input ("subac3", OP_DREG_OUTPUT, OP_DREG, OP_ACCUM);
+  tmp = SEXT40 ((GPR (OP[1]) << 16) | GPR (OP[1] + 1)) - SEXT40 (ACC (OP[2]));
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* subac3 */
+void
+OP_17000002 ()
+{
+  int64 tmp;
+
+  trace_input ("subac3", OP_DREG_OUTPUT, OP_ACCUM, OP_ACCUM);
+  tmp = SEXT40 (ACC (OP[1])) - SEXT40(ACC (OP[2]));
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* subac3s */
+void
+OP_17001000 ()
+{
+  int64 tmp;
+
+  trace_input ("subac3s", OP_DREG_OUTPUT, OP_DREG, OP_ACCUM);
+  SET_PSW_F1 (PSW_F0);
+  tmp = SEXT40 ((GPR (OP[1]) << 16) | GPR (OP[1] + 1)) - SEXT40(ACC (OP[2]));
+  if (tmp > SEXT40(MAX32))
+    {
+      tmp = (MAX32);
+      SET_PSW_F0 (1);
+    }      
+  else if (tmp < SEXT40(MIN32))
+    {
+      tmp = (MIN32);
+      SET_PSW_F0 (1);
+    }      
+  else
+    {
+      SET_PSW_F0 (0);
+    }      
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* subac3s */
+void
+OP_17001002 ()
+{
+  int64 tmp;
+
+  trace_input ("subac3s", OP_DREG_OUTPUT, OP_ACCUM, OP_ACCUM);
+  SET_PSW_F1 (PSW_F0);
+  tmp = SEXT40(ACC (OP[1])) - SEXT40(ACC (OP[2]));
+  if (tmp > SEXT40(MAX32))
+    {
+      tmp = (MAX32);
+      SET_PSW_F0 (1);
+    }      
+  else if (tmp < SEXT40(MIN32))
+    {
+      tmp = (MIN32);
+      SET_PSW_F0 (1);
+    }      
+  else
+    {
+      SET_PSW_F0 (0);
+    }      
+  SET_GPR32 (OP[0], tmp);
+  trace_output_32 (tmp);
+}
+
+/* subi */
+void
+OP_1 ()
+{
+  unsigned tmp;
+  if (OP[1] == 0)
+    OP[1] = 16;
+
+  trace_input ("subi", OP_REG, OP_CONSTANT16, OP_VOID);
+  /* see ../common/sim-alu.h for a more extensive discussion on how to
+     compute the carry/overflow bits. */
+  /* since OP[1] is never <= 0, -OP[1] == ~OP[1]+1 can never overflow */
+  tmp = ((unsigned)(unsigned16) GPR (OP[0])
+	 + (unsigned)(unsigned16) ( - OP[1]));
+  SET_PSW_C (tmp >= (1 << 16));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* trap */
+void
+OP_5F00 ()
+{
+  trace_input ("trap", OP_CONSTANT4, OP_VOID, OP_VOID);
+  trace_output_void ();
+
+  switch (OP[0])
+    {
+    default:
+#if (DEBUG & DEBUG_TRAP) == 0
+      {
+	uint16 vec = OP[0] + TRAP_VECTOR_START;
+	SET_BPC (PC + 1);
+	SET_BPSW (PSW);
+	SET_PSW (PSW & PSW_SM_BIT);
+	JMP (vec);
+	break;
+      }
+#else			/* if debugging use trap to print registers */
+      {
+	int i;
+	static int first_time = 1;
+
+	if (first_time)
+	  {
+	    first_time = 0;
+	    (*d10v_callback->printf_filtered) (d10v_callback, "Trap  #     PC ");
+	    for (i = 0; i < 16; i++)
+	      (*d10v_callback->printf_filtered) (d10v_callback, "  %sr%d", (i > 9) ? "" : " ", i);
+	    (*d10v_callback->printf_filtered) (d10v_callback, "         a0         a1 f0 f1 c\n");
+	  }
+
+	(*d10v_callback->printf_filtered) (d10v_callback, "Trap %2d 0x%.4x:", (int)OP[0], (int)PC);
+
+	for (i = 0; i < 16; i++)
+	  (*d10v_callback->printf_filtered) (d10v_callback, " %.4x", (int) GPR (i));
+
+	for (i = 0; i < 2; i++)
+	  (*d10v_callback->printf_filtered) (d10v_callback, " %.2x%.8lx",
+					     ((int)(ACC (i) >> 32) & 0xff),
+					     ((unsigned long) ACC (i)) & 0xffffffff);
+
+	(*d10v_callback->printf_filtered) (d10v_callback, "  %d  %d %d\n",
+					   PSW_F0 != 0, PSW_F1 != 0, PSW_C != 0);
+	(*d10v_callback->flush_stdout) (d10v_callback);
+	break;
+      }
+#endif
+    case 15:			/* new system call trap */
+      /* Trap 15 is used for simulating low-level I/O */
+      {
+	unsigned32 result = 0;
+	errno = 0;
+
+/* Registers passed to trap 0 */
+
+#define FUNC   GPR (4)	/* function number */
+#define PARM1  GPR (0)	/* optional parm 1 */
+#define PARM2  GPR (1)	/* optional parm 2 */
+#define PARM3  GPR (2)	/* optional parm 3 */
+#define PARM4  GPR (3)	/* optional parm 3 */
+
+/* Registers set by trap 0 */
+
+#define RETVAL(X)   do { result = (X); SET_GPR (0, result); } while (0)
+#define RETVAL32(X) do { result = (X); SET_GPR (0, result >> 16); SET_GPR (1, result); } while (0)
+#define RETERR(X) SET_GPR (4, (X))		/* return error code */
+
+/* Turn a pointer in a register into a pointer into real memory. */
+
+#define MEMPTR(x) ((char *)(dmem_addr(x)))
+
+	switch (FUNC)
+	  {
+#if !defined(__GO32__) && !defined(_WIN32)
+	  case TARGET_SYS_fork:
+	    trace_input ("<fork>", OP_VOID, OP_VOID, OP_VOID);
+	    RETVAL (fork ());
+	    trace_output_16 (result);
+	    break;
+
+#define getpid() 47
+	  case TARGET_SYS_getpid:
+	    trace_input ("<getpid>", OP_VOID, OP_VOID, OP_VOID);
+	    RETVAL (getpid ());
+	    trace_output_16 (result);
+	    break;
+
+	  case TARGET_SYS_kill:
+	    trace_input ("<kill>", OP_R0, OP_R1, OP_VOID);
+	    if (PARM1 == getpid ())
+	      {
+		trace_output_void ();
+		State.exception = PARM2;
+	      }
+	    else
+	      {
+		int os_sig = -1;
+		switch (PARM2)
+		  {
+#ifdef SIGHUP
+		  case 1: os_sig = SIGHUP;	break;
+#endif
+#ifdef SIGINT
+		  case 2: os_sig = SIGINT;	break;
+#endif
+#ifdef SIGQUIT
+		  case 3: os_sig = SIGQUIT;	break;
+#endif
+#ifdef SIGILL
+		  case 4: os_sig = SIGILL;	break;
+#endif
+#ifdef SIGTRAP
+		  case 5: os_sig = SIGTRAP;	break;
+#endif
+#ifdef SIGABRT
+		  case 6: os_sig = SIGABRT;	break;
+#elif defined(SIGIOT)
+		  case 6: os_sig = SIGIOT;	break;
+#endif
+#ifdef SIGEMT
+		  case 7: os_sig = SIGEMT;	break;
+#endif
+#ifdef SIGFPE
+		  case 8: os_sig = SIGFPE;	break;
+#endif
+#ifdef SIGKILL
+		  case 9: os_sig = SIGKILL;	break;
+#endif
+#ifdef SIGBUS
+		  case 10: os_sig = SIGBUS;	break;
+#endif
+#ifdef SIGSEGV
+		  case 11: os_sig = SIGSEGV;	break;
+#endif
+#ifdef SIGSYS
+		  case 12: os_sig = SIGSYS;	break;
+#endif
+#ifdef SIGPIPE
+		  case 13: os_sig = SIGPIPE;	break;
+#endif
+#ifdef SIGALRM
+		  case 14: os_sig = SIGALRM;	break;
+#endif
+#ifdef SIGTERM
+		  case 15: os_sig = SIGTERM;	break;
+#endif
+#ifdef SIGURG
+		  case 16: os_sig = SIGURG;	break;
+#endif
+#ifdef SIGSTOP
+		  case 17: os_sig = SIGSTOP;	break;
+#endif
+#ifdef SIGTSTP
+		  case 18: os_sig = SIGTSTP;	break;
+#endif
+#ifdef SIGCONT
+		  case 19: os_sig = SIGCONT;	break;
+#endif
+#ifdef SIGCHLD
+		  case 20: os_sig = SIGCHLD;	break;
+#elif defined(SIGCLD)
+		  case 20: os_sig = SIGCLD;	break;
+#endif
+#ifdef SIGTTIN
+		  case 21: os_sig = SIGTTIN;	break;
+#endif
+#ifdef SIGTTOU
+		  case 22: os_sig = SIGTTOU;	break;
+#endif
+#ifdef SIGIO
+		  case 23: os_sig = SIGIO;	break;
+#elif defined (SIGPOLL)
+		  case 23: os_sig = SIGPOLL;	break;
+#endif
+#ifdef SIGXCPU
+		  case 24: os_sig = SIGXCPU;	break;
+#endif
+#ifdef SIGXFSZ
+		  case 25: os_sig = SIGXFSZ;	break;
+#endif
+#ifdef SIGVTALRM
+		  case 26: os_sig = SIGVTALRM;	break;
+#endif
+#ifdef SIGPROF
+		  case 27: os_sig = SIGPROF;	break;
+#endif
+#ifdef SIGWINCH
+		  case 28: os_sig = SIGWINCH;	break;
+#endif
+#ifdef SIGLOST
+		  case 29: os_sig = SIGLOST;	break;
+#endif
+#ifdef SIGUSR1
+		  case 30: os_sig = SIGUSR1;	break;
+#endif
+#ifdef SIGUSR2
+		  case 31: os_sig = SIGUSR2;	break;
+#endif
+		  }
+
+		if (os_sig == -1)
+		  {
+		    trace_output_void ();
+		    (*d10v_callback->printf_filtered) (d10v_callback, "Unknown signal %d\n", PARM2);
+		    (*d10v_callback->flush_stdout) (d10v_callback);
+		    State.exception = SIGILL;
+		  }
+		else
+		  {
+		    RETVAL (kill (PARM1, PARM2));
+		    trace_output_16 (result);
+		  }
+	      }
+	    break;
+
+	  case TARGET_SYS_execve:
+	    trace_input ("<execve>", OP_R0, OP_R1, OP_R2);
+	    RETVAL (execve (MEMPTR (PARM1), (char **) MEMPTR (PARM2),
+			     (char **)MEMPTR (PARM3)));
+	    trace_output_16 (result);
+	    break;
+
+#ifdef TARGET_SYS_execv
+	  case TARGET_SYS_execv:
+	    trace_input ("<execv>", OP_R0, OP_R1, OP_VOID);
+	    RETVAL (execve (MEMPTR (PARM1), (char **) MEMPTR (PARM2), NULL));
+	    trace_output_16 (result);
+	    break;
+#endif
+
+	  case TARGET_SYS_pipe:
+	    {
+	      reg_t buf;
+	      int host_fd[2];
+
+	      trace_input ("<pipe>", OP_R0, OP_VOID, OP_VOID);
+	      buf = PARM1;
+	      RETVAL (pipe (host_fd));
+	      SW (buf, host_fd[0]);
+	      buf += sizeof(uint16);
+	      SW (buf, host_fd[1]);
+	      trace_output_16 (result);
+	    }
+	  break;
+
+#if 0
+#ifdef TARGET_SYS_wait
+	  case TARGET_SYS_wait:
+	    {
+	      int status;
+	      trace_input ("<wait>", OP_R0, OP_VOID, OP_VOID);
+	      RETVAL (wait (&status));
+	      if (PARM1)
+		SW (PARM1, status);
+	      trace_output_16 (result);
+	    }
+	  break;
+#endif
+#endif
+#else
+	  case TARGET_SYS_getpid:
+	    trace_input ("<getpid>", OP_VOID, OP_VOID, OP_VOID);
+	    RETVAL (1);
+	    trace_output_16 (result);
+	    break;
+
+	  case TARGET_SYS_kill:
+	    trace_input ("<kill>", OP_REG, OP_REG, OP_VOID);
+	    trace_output_void ();
+	    State.exception = PARM2;
+	    break;
+#endif
+
+	  case TARGET_SYS_read:
+	    trace_input ("<read>", OP_R0, OP_R1, OP_R2);
+	    RETVAL (d10v_callback->read (d10v_callback, PARM1, MEMPTR (PARM2),
+					  PARM3));
+	    trace_output_16 (result);
+	    break;
+
+	  case TARGET_SYS_write:
+	    trace_input ("<write>", OP_R0, OP_R1, OP_R2);
+	    if (PARM1 == 1)
+	      RETVAL ((int)d10v_callback->write_stdout (d10v_callback,
+							 MEMPTR (PARM2), PARM3));
+	    else
+	      RETVAL ((int)d10v_callback->write (d10v_callback, PARM1,
+						  MEMPTR (PARM2), PARM3));
+	    trace_output_16 (result);
+	    break;
+
+	  case TARGET_SYS_lseek:
+	    trace_input ("<lseek>", OP_R0, OP_R1, OP_R2);
+	    RETVAL32 (d10v_callback->lseek (d10v_callback, PARM1,
+					    ((((unsigned long) PARM2) << 16)
+					     || (unsigned long) PARM3),
+					    PARM4));
+	    trace_output_32 (result);
+	    break;
+
+	  case TARGET_SYS_close:
+	    trace_input ("<close>", OP_R0, OP_VOID, OP_VOID);
+	    RETVAL (d10v_callback->close (d10v_callback, PARM1));
+	    trace_output_16 (result);
+	    break;
+
+	  case TARGET_SYS_open:
+	    trace_input ("<open>", OP_R0, OP_R1, OP_R2);
+	    RETVAL (d10v_callback->open (d10v_callback, MEMPTR (PARM1), PARM2));
+	    trace_output_16 (result);
+	    break;
+
+	  case TARGET_SYS_exit:
+	    trace_input ("<exit>", OP_R0, OP_VOID, OP_VOID);
+	    State.exception = SIG_D10V_EXIT;
+	    trace_output_void ();
+	    break;
+
+	  case TARGET_SYS_stat:
+	    trace_input ("<stat>", OP_R0, OP_R1, OP_VOID);
+	    /* stat system call */
+	    {
+	      struct stat host_stat;
+	      reg_t buf;
+
+	      RETVAL (stat (MEMPTR (PARM1), &host_stat));
+
+	      buf = PARM2;
+
+	      /* The hard-coded offsets and sizes were determined by using
+	       * the D10V compiler on a test program that used struct stat.
+	       */
+	      SW  (buf,    host_stat.st_dev);
+	      SW  (buf+2,  host_stat.st_ino);
+	      SW  (buf+4,  host_stat.st_mode);
+	      SW  (buf+6,  host_stat.st_nlink);
+	      SW  (buf+8,  host_stat.st_uid);
+	      SW  (buf+10, host_stat.st_gid);
+	      SW  (buf+12, host_stat.st_rdev);
+	      SLW (buf+16, host_stat.st_size);
+	      SLW (buf+20, host_stat.st_atime);
+	      SLW (buf+28, host_stat.st_mtime);
+	      SLW (buf+36, host_stat.st_ctime);
+	    }
+	    trace_output_16 (result);
+	    break;
+
+	  case TARGET_SYS_chown:
+	    trace_input ("<chown>", OP_R0, OP_R1, OP_R2);
+	    RETVAL (chown (MEMPTR (PARM1), PARM2, PARM3));
+	    trace_output_16 (result);
+	    break;
+
+	  case TARGET_SYS_chmod:
+	    trace_input ("<chmod>", OP_R0, OP_R1, OP_R2);
+	    RETVAL (chmod (MEMPTR (PARM1), PARM2));
+	    trace_output_16 (result);
+	    break;
+
+#if 0
+#ifdef TARGET_SYS_utime
+	  case TARGET_SYS_utime:
+	    trace_input ("<utime>", OP_R0, OP_R1, OP_R2);
+	    /* Cast the second argument to void *, to avoid type mismatch
+	       if a prototype is present.  */
+	    RETVAL (utime (MEMPTR (PARM1), (void *) MEMPTR (PARM2)));
+	    trace_output_16 (result);
+	    break;
+#endif
+#endif
+
+#if 0
+#ifdef TARGET_SYS_time
+	  case TARGET_SYS_time:
+	    trace_input ("<time>", OP_R0, OP_R1, OP_R2);
+	    RETVAL32 (time (PARM1 ? MEMPTR (PARM1) : NULL));
+	    trace_output_32 (result);
+	    break;
+#endif
+#endif
+	    
+	  default:
+	    d10v_callback->error (d10v_callback, "Unknown syscall %d", FUNC);
+	  }
+	if ((uint16) result == (uint16) -1)
+	  RETERR (d10v_callback->get_errno(d10v_callback));
+	else
+	  RETERR (0);
+	break;
+      }
+    }
+}
+
+/* tst0i */
+void
+OP_7000000 ()
+{
+  trace_input ("tst0i", OP_REG, OP_CONSTANT16, OP_VOID);
+  SET_PSW_F1 (PSW_F0);;
+  SET_PSW_F0 ((GPR (OP[0]) & OP[1]) ? 1 : 0);
+  trace_output_flag ();
+}
+
+/* tst1i */
+void
+OP_F000000 ()
+{
+  trace_input ("tst1i", OP_REG, OP_CONSTANT16, OP_VOID);
+  SET_PSW_F1 (PSW_F0);
+  SET_PSW_F0 ((~(GPR (OP[0])) & OP[1]) ? 1 : 0);
+  trace_output_flag ();
+}
+
+/* wait */
+void
+OP_5F80 ()
+{
+  trace_input ("wait", OP_VOID, OP_VOID, OP_VOID);
+  SET_PSW_IE (1);
+  trace_output_void ();
+}
+
+/* xor */
+void
+OP_A00 ()
+{
+  int16 tmp;
+  trace_input ("xor", OP_REG, OP_REG, OP_VOID);
+  tmp = (GPR (OP[0]) ^ GPR (OP[1]));
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+
+/* xor3 */
+void
+OP_5000000 ()
+{
+  int16 tmp;
+  trace_input ("xor3", OP_REG_OUTPUT, OP_REG, OP_CONSTANT16);
+  tmp = (GPR (OP[1]) ^ OP[2]);
+  SET_GPR (OP[0], tmp);
+  trace_output_16 (tmp);
+}
+