bfd ChangeLog

	* elf32-xtensa.c (elf32xtensa_size_opt): New global variable.
	(xtensa_default_isa): Global variable moved here from xtensa-isa.c.
	(elf32xtensa_no_literal_movement): New global variable.
	(elf_howto_table): Add entries for new relocations.
	(elf_xtensa_reloc_type_lookup): Handle new relocations.
	(property_table_compare): When addresses are equal, compare sizes and
	various property flags.
	(property_table_matches): New.
	(xtensa_read_table_entries): Extend to read new property tables.  Add
	output_addr parameter to indicate that output addresses should be used.
	Use bfd_get_section_limit.
	(elf_xtensa_find_property_entry): New.
	(elf_xtensa_in_literal_pool): Use elf_xtensa_find_property_entry.
	(elf_xtensa_check_relocs): Handle new relocations.
	(elf_xtensa_do_reloc): Use bfd_get_section_limit.  Handle new
	relocations.  Use new xtensa-isa.h functions.
	(build_encoding_error_message): Remove encode_result parameter.  Add
	new target_address parameter used to detect alignment errors.
	(elf_xtensa_relocate_section): Use bfd_get_section_limit.  Clean up
	error handling.  Use new is_operand_relocation function.
	(elf_xtensa_combine_prop_entries, elf_xtensa_merge_private_bfd_data):
	Use underbar macro for error messages.  Formatting.
	(get_const16_opcode): New.
	(get_l32r_opcode): Add a separate flag for initialization.
	(get_relocation_opnd): Operand number is no longer explicit in the
	relocation.  Change to decode the opcode and analyze its operands.
	(get_relocation_slot): New.
	(get_relocation_opcode): Add bfd parameter.  Use bfd_get_section_limit.
	Use new xtensa-isa.h functions to handle multislot instructions.
	(is_l32r_relocation): Add bfd parameter.  Use is_operand_relocation.
	(get_asm_simplify_size, is_alt_relocation, is_operand_relocation,
	insn_decode_len, insn_decode_opcode, check_branch_target_aligned,
	check_loop_aligned, check_branch_target_aligned_address, narrowable,
	widenable, narrow_instruction, widen_instruction, op_single_fmt_table,
	get_single_format, init_op_single_format_table): New.
	(elf_xtensa_do_asm_simplify): Add error_message parameter and use it
	instead of calling _bfd_error_handler.  Use new xtensa-isa.h functions.
	(contract_asm_expansion): Add error_message parameter and pass it to
	elf_xtensa_do_asm_simplify.  Replace use of R_XTENSA_OP0 relocation
	with R_XTENSA_SLOT0_OP.
	(get_expanded_call_opcode): Extend to handle either L32R or CONST16
	instructions.  Use new xtensa-isa.h functions.
	(r_reloc struct): Add new virtual_offset field.
	(r_reloc_init): Add contents and content_length parameters.  Set
	virtual_offset field to zero.  Add contents to target_offset field for
	partial_inplace relocations.
	(r_reloc_is_defined): Check for null.
	(print_r_reloc): New debug function.
	(source_reloc struct): Replace xtensa_operand field with pair of the
	opcode and the operand position.  Add is_abs_literal field.
	(init_source_reloc): Specify operand by opcode/position pair.  Set
	is_abs_literal field.
	(source_reloc_compare): When target_offsets are equal, compare other
	fields to make sorting predictable.
	(literal_value struct): Add is_abs_literal field.
	(value_map_hash_table struct): Add has_last_loc and last_loc fields.
	(init_literal_value): New.
	(is_same_value): Replace with ...
	(literal_value_equal): ... this function.  Add comparisons of
	virtual_offset and is_abs_literal fields.
	(value_map_hash_table_init): Use bfd_zmalloc.  Check for allocation
	failure.  Initialize has_last_loc field.
	(value_map_hash_table_delete): New.
	(hash_literal_value): Rename to ...
	(literal_value_hash): ... this.  Include is_abs_literal flag and
	virtual_offset field in the hash value.
	(get_cached_value): Rename to ...
	(value_map_get_cached_value): ... this.  Update calls to
	literal_value_hash and literal_value_equal.
	(add_value_map): Check for allocation failure.  Update calls to
	value_map_get_cached_value and literal_value_hash.
	(text_action, text_action_list, text_action_t): New types.
	(find_fill_action, compute_removed_action_diff, adjust_fill_action,
	text_action_add, text_action_add_literal, offset_with_removed_text,
	offset_with_removed_text_before_fill, find_insn_action,
	print_action_list, print_removed_literals): New.
	(offset_with_removed_literals): Delete.
	(xtensa_relax_info struct): Add is_relaxable_asm_section, action_list,
	fix_array, fix_array_count, allocated_relocs, relocs_count, and
	allocated_relocs_count fields.
	(init_xtensa_relax_info): Initialize new fields.
	(reloc_bfd_fix struct): Add new translated field.
	(reloc_bfd_fix_init): Add translated parameter and use it to set the
	translated field.
	(fix_compare, cache_fix_array): New.
	(get_bfd_fix): Remove fix_list parameter and get all relax_info for the
	section via get_xtensa_relax_info.  Use cache_fix_array to set up
	sorted fix_array and use bsearch instead of linear search.
	(section_cache_t): New struct.
	(init_section_cache, section_cache_section, clear_section_cache): New.
	(ebb_t, ebb_target_enum, proposed_action, ebb_constraint): New types.
	(init_ebb_constraint, free_ebb_constraint, init_ebb, extend_ebb_bounds,
	extend_ebb_bounds_forward, extend_ebb_bounds_backward,
	insn_block_decodable_len, ebb_propose_action, ebb_add_proposed_action):
	New.
	(retrieve_contents): Use bfd_get_section_limit.
	(elf_xtensa_relax_section): Add relocations_analyzed flag.  Update call
	to compute_removed_literals.  Free value_map_hash_table when no longer
	needed.
	(analyze_relocations): Check is_relaxable_asm_section flag.  Call
	compute_text_actions for all sections.
	(find_relaxable_sections): Mark sections as relaxable if they contain
	ASM_EXPAND relocations that can be optimized.  Adjust r_reloc_init
	call.  Increment relax_info src_count field only for appropriate
	relocation types.  Remove is_literal_section check.
	(collect_source_relocs): Use bfd_get_section_limit.  Adjust calls to
	r_reloc_init and find_associated_l32r_irel.  Check
	is_relaxable_asm_section flag.  Handle L32R instructions with absolute
	literals.  Pass is_abs_literal flag to init_source_reloc.
	(is_resolvable_asm_expansion): Use bfd_get_section_limit.  Check for
	CONST16 instructions.  Adjust calls to r_reloc_init and
	pcrel_reloc_fits.  Handle weak symbols conservatively.
	(find_associated_l32r_irel): Add bfd parameter and pass it to
	is_l32r_relocation.
	(compute_text_actions, compute_ebb_proposed_actions,
	compute_ebb_actions, check_section_ebb_pcrels_fit,
	check_section_ebb_reduces, text_action_add_proposed,
	compute_fill_extra_space): New.
	(remove_literals): Replace with ...
	(compute_removed_literals): ... this function.  Call
	init_section_cache.  Use bfd_get_section_limit.  Sort internal_relocs.
	Call xtensa_read_table_entries to get the property table.  Skip
	relocations other than R_XTENSA_32 and R_XTENSA_PLT.  Use new
	is_removable_literal, remove_dead_literal, and
	identify_literal_placement functions.
	(get_irel_at_offset): Rewrite to use bsearch on sorted relocations
	instead of linear search.
	(is_removable_literal, remove_dead_literal,
	identify_literal_placement): New.
	(relocations_reach): Update check for literal not referenced by any
	PC-relative relocations.  Adjust call to pcrel_reloc_fits.
	(coalesce_shared_literal, move_shared_literal): New.
	(relax_section): Use bfd_get_section_limit.  Call
	translate_section_fixes.  Update calls to r_reloc_init and
	offset_with_removed_text.  Check new is_relaxable_asm_section flag.
	Add call to pin_internal_relocs.  Add special handling for
	R_XTENSA_ASM_SIMPLIFY and R_XTENSA_DIFF* relocs.  Use virtual_offset
	info to calculate new addend_displacement variable.  Replace code for
	deleting literals with more general code to perform the actions
	determined by the action_list for the section.
	(translate_section_fixes, translate_reloc_bfd_fix): New.
	(translate_reloc): Check new is_relaxable_asm_section flag.  Call
	find_removed_literal only if is_operand_relocation.  Update call to
	offset_with_removed_text.  Use new target_offset and removed_bytes
	variables.
	(move_literal): New.
	(relax_property_section):  Use bfd_get_section_limit.  Set new
	is_full_prop_section flag and handle new property tables.  Update calls
	to r_reloc_init and offset_with_removed_text.  Check
	is_relaxable_asm_section flag.  Handle expansion of zero-sized
	unreachable entries, with use of offset_with_removed_text_before_fill.
	For relocatable links, combine entries only for literal tables.
	(relax_section_symbols): Check is_relaxable_asm_section flag.  Update
	calls to offset_with_removed_text.  Translate st_size field for
	function symbols.
	(do_fix_for_relocatable_link): Change to return bfd_boolean to indicate
	failure.  Add contents parameter.  Update call to get_bfd_fix.  Update
	call to r_reloc_init.  Call _bfd_error_handler and return FALSE for
	R_XTENSA_ASM_EXPAND relocs.
	(do_fix_for_final_link): Add input_bfd and contents parameters.  Update
	call to get_bfd_fix.  Include offset from contents for partial_inplace
	relocations.
	(is_reloc_sym_weak): New.
	(pcrel_reloc_fits): Use new xtensa-isa.h functions.
	(prop_sec_len): New.
	(xtensa_is_property_section): Handle new property sections.
	(is_literal_section): Delete.
	(internal_reloc_compare): When r_offset matches, compare r_info and
	r_addend to make sorting predictable.
	(internal_reloc_matches): New.
	(xtensa_get_property_section_name): Handle new property sections.
	(xtensa_get_property_predef_flags): New.
	(xtensa_callback_required_dependence): Use bfd_get_section_limit.
	Update calls to xtensa_isa_init, is_l32r_relocation, and r_reloc_init.
	* xtensa-isa.c (xtensa_default_isa): Moved to elf32-xtensa.c.
	(xtisa_errno, xtisa_error_msg): New variables.
	(xtensa_isa_errno, xtensa_isa_error_msg): New.
	(xtensa_insnbuf_alloc): Add error handling.
	(xtensa_insnbuf_to_chars): Add num_chars parameter.  Update to
	use xtensa_format_decode.  Add error handling.
	(xtensa_insnbuf_from_chars): Add num_chars parameter.  Decode the
	instruction length to find the number of bytes to copy.
	(xtensa_isa_init): Add error handling.  Replace calls to
	xtensa_load_isa and xtensa_extend_isa with code to initialize lookup
	tables in the xtensa_modules structure.
	(xtensa_check_isa_config, xtensa_add_isa, xtensa_load_isa,
	xtensa_extend_isa): Delete.
	(xtensa_isa_free): Change to only free lookup tables.
	(opname_lookup_compare): Replace with ...
	(xtensa_isa_name_compare): ... this function.  Use strcasecmp.
	(xtensa_insn_maxlength): Rename to ...
	(xtensa_isa_maxlength): ... this.
	(xtensa_insn_length): Delete.
	(xtensa_insn_length_from_first_byte): Replace with ...
	(xtensa_isa_length_from_chars): ... this function.
	(xtensa_num_opcodes): Rename to ...
	(xtensa_isa_num_opcodes): ... this.
	(xtensa_isa_num_pipe_stages, xtensa_isa_num_formats,
	xtensa_isa_num_regfiles, xtensa_isa_num_stages,
	xtensa_isa_num_sysregs, xtensa_isa_num_interfaces,
	xtensa_isa_num_funcUnits, xtensa_format_name, xtensa_format_lookup,
	xtensa_format_decode, xtensa_format_encode, xtensa_format_length,
	xtensa_format_num_slots, xtensa_format_slot_nop_opcode,
	xtensa_format_get_slot, xtensa_format_set_slot): New functions.
	(xtensa_opcode_lookup): Add error handling.
	(xtensa_decode_insn): Replace with ...
	(xtensa_opcode_decode): ... this function, with new format and
	slot parameters.  Add error handling.
	(xtensa_encode_insn): Replace with ...
	(xtensa_opcode_encode): ... this function, which does the encoding via
	one of the entries in the "encode_fns" array.  Add error handling.
	(xtensa_opcode_name): Add error handling.
	(xtensa_opcode_is_branch, xtensa_opcode_is_jump, xtensa_opcode_is_loop,
	xtensa_opcode_is_call): New.
	(xtensa_num_operands): Replace with ...
	(xtensa_opcode_num_operands): ... this function.  Add error handling.
	(xtensa_opcode_num_stateOperands,
	xtensa_opcode_num_interfaceOperands, xtensa_opcode_num_funcUnit_uses,
	xtensa_opcode_funcUnit_use, xtensa_operand_name,
	xtensa_operand_is_visible): New.
	(xtensa_get_operand, xtensa_operand_kind): Delete.
	(xtensa_operand_inout): Add error handling and special-case for
	"sout" operands.
	(xtensa_operand_get_field, xtensa_operand_set_field): Rewritten to
	operate on one slot of an instruction.  Added error handling.
	(xtensa_operand_encode): Handle default operands with no encoding
	functions.  Check for success by comparing against decoded value.
	Add error handling.
	(xtensa_operand_decode): Handle default operands.  Return decoded value
	through argument pointer.  Add error handling.
	(xtensa_operand_is_register, xtensa_operand_regfile,
	xtensa_operand_num_regs, xtensa_operand_is_known_reg): New.
	(xtensa_operand_isPCRelative): Rename to ...
	(xtensa_operand_is_PCrelative): ... this.  Add error handling.
	(xtensa_operand_do_reloc, xtensa_operand_undo_reloc): Return value
	through argument pointer.  Add error handling.
	(xtensa_stateOperand_state, xtensa_stateOperand_inout,
	xtensa_interfaceOperand_interface, xtensa_regfile_lookup,
	xtensa_regfile_lookup_shortname, xtensa_regfile_name,
	xtensa_regfile_shortname, xtensa_regfile_view_parent,
	xtensa_regfile_num_bits, xtensa_regfile_num_entries,
	xtensa_state_lookup, xtensa_state_name, xtensa_state_num_bits,
	xtensa_state_is_exported, xtensa_sysreg_lookup,
	xtensa_sysreg_lookup_name, xtensa_sysreg_name, xtensa_sysreg_number,
	xtensa_sysreg_is_user, xtensa_interface_lookup, xtensa_interface_name,
	xtensa_interface_num_bits, xtensa_interface_inout,
	xtensa_interface_has_side_effect, xtensa_funcUnit_lookup,
	xtensa_funcUnit_name, xtensa_funcUnit_num_copies): New.
	* xtensa-modules.c: Rewrite to use new data structures.
	* reloc.c (BFD_RELOC_XTENSA_DIFF8, BFD_RELOC_XTENSA_DIFF16,
	BFD_RELOC_XTENSA_DIFF32, BFD_RELOC_XTENSA_SLOT0_OP,
	BFD_RELOC_XTENSA_SLOT1_OP, BFD_RELOC_XTENSA_SLOT2_OP,
	BFD_RELOC_XTENSA_SLOT3_OP, BFD_RELOC_XTENSA_SLOT4_OP,
	BFD_RELOC_XTENSA_SLOT5_OP, BFD_RELOC_XTENSA_SLOT6_OP,
	BFD_RELOC_XTENSA_SLOT7_OP, BFD_RELOC_XTENSA_SLOT8_OP,
	BFD_RELOC_XTENSA_SLOT9_OP, BFD_RELOC_XTENSA_SLOT10_OP,
	BFD_RELOC_XTENSA_SLOT11_OP, BFD_RELOC_XTENSA_SLOT12_OP,
	BFD_RELOC_XTENSA_SLOT13_OP, BFD_RELOC_XTENSA_SLOT14_OP,
	BFD_RELOC_XTENSA_SLOT0_ALT, BFD_RELOC_XTENSA_SLOT1_ALT,
	BFD_RELOC_XTENSA_SLOT2_ALT, BFD_RELOC_XTENSA_SLOT3_ALT,
	BFD_RELOC_XTENSA_SLOT4_ALT, BFD_RELOC_XTENSA_SLOT5_ALT,
	BFD_RELOC_XTENSA_SLOT6_ALT, BFD_RELOC_XTENSA_SLOT7_ALT,
	BFD_RELOC_XTENSA_SLOT8_ALT, BFD_RELOC_XTENSA_SLOT9_ALT,
	BFD_RELOC_XTENSA_SLOT10_ALT, BFD_RELOC_XTENSA_SLOT11_ALT,
	BFD_RELOC_XTENSA_SLOT12_ALT, BFD_RELOC_XTENSA_SLOT13_ALT,
	BFD_RELOC_XTENSA_SLOT14_ALT): Add new relocations.
	* Makefile.am (xtensa-isa.lo, xtensa-modules.lo): Update dependencies.
	* Makefile.in: Regenerate.
	* bfd-in2.h: Likewise.
	* libbfd.h: Likewise.

gas ChangeLog

	* config/tc-xtensa.c (absolute_literals_supported): New global flag.
	(UNREACHABLE_MAX_WIDTH): Define.
	(XTENSA_FETCH_WIDTH): Delete.
	(cur_vinsn, xtensa_fetch_width, xt_saved_debug_type, past_xtensa_end,
	prefer_const16, prefer_l32r): New global variables.
	(LIT4_SECTION_NAME): Define.
	(lit4_state struct): Add lit4_seg_name and lit4_seg fields.
	(XTENSA_PROP_*, GET_XTENSA_PROP_*, SET_XTENSA_PROP_*): Define.
	(frag_flags struct): New.
	(xtensa_block_info struct): Move from tc-xtensa.h.  Add flags field.
	(subseg_map struct): Add cur_total_freq and cur_target_freq fields.
	(bitfield, bit_is_set, set_bit, clear_bit): Define.
	(MAX_FORMATS): Define.
	(op_placement_info struct, op_placement_table): New.
	(O_pltrel, O_hi16, O_lo16): Define.
	(directiveE enum): Rename directive_generics to directive_transform.
	Delete directive_relax.  Add directive_schedule,
	directive_absolute_literals, and directive_last_directive.
	(directive_info): Rename "generics" to "transform".  Delete "relax".
	Add "schedule" and "absolute-literals".
	(directive_state): Adjust entries to match changes in directive_info.
	(xtensa_relax_statesE, RELAX_IMMED_MAXSTEPS): Move to tc-xtensa.h.
	(xtensa_const16_opcode, xtensa_movi_opcode, xtensa_movi_n_opcode,
	xtensa_l32r_opcode, xtensa_nop_opcode, xtensa_rsr_lcount_opcode): New.
	(xtensa_j_opcode, xtensa_rsr_opcode): Delete.
	(align_only_targets, software_a0_b_retw_interlock,
	software_avoid_b_j_loop_end, maybe_has_b_j_loop_end,
	software_avoid_short_loop, software_avoid_close_loop_end,
	software_avoid_all_short_loops, specific_opcode): Delete.
	(warn_unaligned_branch_targets): New.
	(workaround_a0_b_retw, workaround_b_j_loop_end, workaround_short_loop,
	workaround_close_loop_end, workaround_all_short_loops): Default FALSE.
	(option_[no_]link_relax, option_[no_]transform,
	option_[no_]absolute_literals, option_warn_unaligned_targets,
	option_prefer_l32r, option_prefer_const16, option_target_hardware):
	New enum values.
	(option_[no_]align_only_targets, option_literal_section_name,
	option_text_section_name, option_data_section_name,
	option_bss_section_name, option_eb, option_el): Delete.
	(md_longopts): Add entries for: [no-]transform, [no-]absolute-literals,
	warn-unaligned-targets, prefer-l32r, prefer-const16, [no-]link-relax,
	and target-hardware.  Delete entries for [no-]target-align-only,
	literal-section-name, text-section-name, data-section-name, and
	bss-section-name.
	(md_parse_option): Handle new options and remove old ones.  Accept but
	ignore [no-]density options.  Warn for [no-]generics and [no-]relax
	and treat them as [no-]transform.
	(md_show_usage): Add new options and remove old ones.
	(xtensa_setup_hw_workarounds): New.
	(md_pseudo_table): Change "word" entry to use xtensa_elf_cons.  Add
	"long", "short", "loc" and "frequency" entries.
	(use_generics): Rename to ...
	(use_transform): ... this function.  Add past_xtensa_end check.
	(use_longcalls): Add past_xtensa_end check.
	(code_density_available, can_relax): Delete.
	(do_align_targets): New.
	(get_directive): Accept dashes in directive names.  Warn about
	[no-]generics and [no-]relax directives and treat them as
	[no-]transform.
	(xtensa_begin_directive): Call md_flush_pending_output only for some
	directives.  Check for directives inside instruction bundles.  Warn
	about deprecated ".begin literal" usage.  Warn and ignore [no-]density
	directives.  Handle new directives.  Check generating_literals flag
	for literal_prefix.
	(xtensa_end_directive): Check for directives inside instruction
	bundles.  Warn and ignore [no-]density directives.  Handle new
	directives.  Call xtensa_set_frag_assembly_state.
	(xtensa_loc_directive_seen, xtensa_dwarf2_directive_loc,
	xtensa_dwarf2_emit_insn): New.
	(xtensa_literal_position): Call md_flush_pending_output.  Do not check
	use_literal_section flag.
	(xtensa_literal_pseudo): Call md_flush_pending_output.  Handle absolute
	literals.  Use xtensa_elf_cons to parse the expression.
	(xtensa_literal_prefix): Do not check use_literal_section.  Support
	".lit4" sections for absolute literals.  Change prefix convention to
	replace ".text" (or ".t" in a linkonce section).  No need to call
	subseg_set.
	(xtensa_frequency_pseudo, xtensa_elf_cons, xtensa_elf_suffix): New.
	(expression_end): Handle closing braces and colons.
	(PLT_SUFFIX, plt_suffix): Delete.
	(expression_maybe_register): Use new xtensa-isa.h functions.  Use
	xtensa_elf_suffix instead of checking for plt suffix, and handle O_lo16
	and O_hi16 expressions as well.
	(tokenize_arguments): Handle closing braces and colons.
	(parse_arguments): Use new xtensa-isa.h functions.  Handle "invisible"
	operands and paired register syntax.
	(get_invisible_operands): New.
	(xg_translate_sysreg_op): Handle new Xtensa LX RSR/WSR/XSR syntax.  Use
	new xtensa-isa.h functions.
	(xtensa_translate_old_userreg_ops, xtensa_translate_zero_immed): New.
	(xg_translate_idioms): Check if inside bundle.  Use use_transform.
	Handle new Xtensa LX RSR/WSR/XSR syntax.  Remove code to widen density
	instructions.  Use xtensa_translate_zero_immed.
	(operand_is_immed, operand_is_pcrel_label): Delete.
	(get_relaxable_immed): Use new xtensa-isa.h functions.
	(get_opcode_from_buf): Add slot parameter.  Use new xtensa-isa.h
	functions.
	(xtensa_print_insn_table, print_vliw_insn): New.
	(is_direct_call_opcode): Use new xtensa-isa.h functions.
	(is_call_opcode, is_loop_opcode, is_conditional_branch_opcode,
	is_branch_or_jump_opcode): Delete.
	(is_movi_opcode, decode_reloc, encode_reloc, encode_alt_reloc): New.
	(opnum_to_reloc, reloc_to_opnum): Delete.
	(xtensa_insnbuf_set_operand, xtensa_insnbuf_get_operand): Use new
	xtensa-isa.h functions.  Operate on one slot of an instruction.
	(xtensa_insnbuf_set_immediate_field, is_negatable_branch,
	xg_get_insn_size): Delete.
	(xg_get_build_instr_size): Use xg_get_single_size.
	(xg_is_narrow_insn, xg_is_single_relaxable_insn): Update calls to
	xg_build_widen_table.  Use xg_get_single_size.
	(xg_get_max_narrow_insn_size): Delete.
	(xg_get_max_insn_widen_size, xg_get_max_insn_widen_literal_size,
	xg_is_relaxable_insn): Update calls to xg_build_widen_table.  Use
	xg_get_single_size.
	(xg_build_to_insn): Record the loc field.  Handle OP_OPERAND_HI16U and
	OP_OPERAND_LOW16U.  Check xg_valid_literal_expression.
	(xg_expand_to_stack, xg_expand_narrow): Update calls to
	xg_build_widen_table.  Use xg_get_single_size.
	(xg_immeds_fit): Use new xtensa-isa.h functions.  Update call to
	xg_check_operand.
	(xg_symbolic_immeds_fit): Likewise.  Also handle O_lo16 and O_hi16, and
	treat weak symbols conservatively.
	(xg_check_operand): Use new xtensa-isa.h functions.
	(is_dnrange): Delete.
	(xg_assembly_relax): Inline previous calls to tinsn_copy.
	(xg_finish_frag): Specify separate relax states for the frag and slot0.
	(is_branch_jmp_to_next, xg_add_branch_and_loop_targets): Use new
	xtensa-isa.h functions.
	(xg_instruction_matches_option_term, xg_instruction_matches_or_options,
	xg_instruction_matches_options): New.
	(xg_instruction_matches_rule): Handle O_register expressions.  Call
	xg_instruction_matches_options.
	(transition_rule_cmp): New.
	(xg_instruction_match): Update call to xg_build_simplify_table.
	(xg_build_token_insn): Record loc fields.
	(xg_simplify_insn): Check is_specific_opcode field and
	density_supported flag.
	(xg_expand_assembly_insn): Skip checking code_density_available.  Use
	new xtensa-isa.h functions.  Call use_transform instead of can_relax.
	(xg_assemble_literal): Add error handling for O_big.  Call
	record_alignment.  Handle O_pltrel.
	(xg_valid_literal_expression): New.
	(xg_assemble_literal_space): Add slot parameter.  Remove call to
	set_expr_symbol_offset.  Add call to record_alignment.  Update call to
	xg_finish_frag.
	(xg_emit_insn): Delete.
	(xg_emit_insn_to_buf): Add format parameter.  Update calls to
	xg_add_opcode_fix and xtensa_insnbuf_to_chars.
	(xg_add_opcode_fix): Change opcode parameter to tinsn and add format
	and slot parameters.  Handle new "alternate" relocations for absolute
	literals and CONST16 instructions.  Check for bad uses of O_lo16 and
	O_hi16.  Use new xtensa-isa.h functions.
	(xg_assemble_tokens): Delete.
	(is_register_writer): Use new xtensa-isa.h functions.
	(is_bad_loopend_opcode): Check for xtensa_rsr_lcount_opcode instead of
	old-style RSR from LCOUNT.
	(next_frag_opcode): Delete.
	(next_frag_opcode_is_loop, next_frag_format_size, frag_format_size,
	update_next_frag_state): New.
	(update_next_frag_nop_state): Delete.
	(next_frag_pre_opcode_bytes): Use next_frag_opcode_is_loop.
	(xtensa_mark_literal_pool_location): Check use_literal_section flag and
	the state of the absolute-literals directive.  Add calls to
	record_alignment and xtensa_set_frag_assembly_state.  Call
	xtensa_switch_to_non_abs_literal_fragment instead of
	xtensa_switch_to_literal_fragment.
	(build_nop): New.
	(assemble_nop): Use build_nop.  Update call to xtensa_insnbuf_to_chars.
	(get_expanded_loop_offset): Change check for undefined opcode to an
	assertion.
	(xtensa_set_frag_assembly_state, relaxable_section,
	xtensa_find_unmarked_state_frags, xtensa_find_unaligned_branch_targets,
	xtensa_find_unaligned_loops, xg_apply_tentative_value): New.
	(md_begin): Update call to xtensa_isa_init.  Initialize linkrelax to 1.
	Set lit4_seg_name.  Call xg_init_vinsn.  Initialize new global opcodes.
	Call init_op_placement_info_table and xtensa_set_frag_assembly_state.
	(xtensa_init_fix_data): New.
	(xtensa_frob_label): Reset label symbol to the current frag.  Check
	do_align_targets and generating_literals flag.  Propagate frequency
	info to new alignment frag.  Call xtensa_set_frag_assembly_state.
	(xtensa_unrecognized_line): New.
	(xtensa_flush_pending_output): Check if inside a bundle.  Add a call
	to xtensa_set_frag_assembly_state.
	(error_reset_cur_vinsn): New.
	(md_assemble): Remove check for literal frag.  Remove call to
	istack_init.  Call use_transform instead of use_generics.  Parse
	explicit instruction format specifiers.  Move code for
	a0_b_retw_interlock workaround to xg_assemble_vliw_tokens.  Call
	error_reset_cur_vinsn on errors.  Add call to get_invisible_operands.
	Add dwarf2_where call.  Remote automatic alignment for ENTRY
	instructions.  Move call to xtensa_clear_insn_labels to the end.
	Rearrange to handle bundles.
	(xtensa_cons_fix_new): Delete.
	(xtensa_handle_align): New.
	(xtensa_frag_init): Call xtensa_set_frag_assembly_state.  Remove
	assignment to is_no_density field.
	(md_pcrel_from): Use new xtensa-isa.h functions.  Use decode_reloc
	instead of reloc_to_opnum.  Handle "alternate" relocations.
	(xtensa_force_relocation, xtensa_check_inside_bundle,
	xtensa_elf_section_change_hook): New.
	(xtensa_symbol_new_hook): Delete.
	(xtensa_fix_adjustable): Check for difference of symbols with an
	offset.  Check for external and weak symbols.
	(md_apply_fix3): Remove cases for XTENSA_OP{0,1,2} relocs.
	(md_estimate_size_before_relax): Return expansion for the first slot.
	(tc_gen_reloc): Handle difference of symbols by producing
	XTENSA_DIFF{8,16,32} relocs and by writing the value of the difference
	into the output.  Handle new XTENSA_SLOT*_OP relocs by storing the
	tentative values into the output when linkrelax is set.
	(XTENSA_PROP_SEC_NAME): Define.
	(xtensa_post_relax_hook): Call xtensa_find_unmarked_state_frags.
	Create literal tables only if using literal sections.  Create new
	property tables instead of old instruction tables.  Check for unaligned
	branch targets and loops.
	(finish_vinsn, find_vinsn_conflicts, check_t1_t2_reads_and_writes,
	new_resource_table, clear_resource_table, resize_resource_table,
	resources_available, reserve_resources, release_resources,
	opcode_funcUnit_use_unit, opcode_funcUnit_use_stage,
	resources_conflict, xg_find_narrowest_format, relaxation_requirements,
	bundle_single_op, emit_single_op, xg_assemble_vliw_tokens): New.
	(xtensa_end): Call xtensa_flush_pending_output.  Set past_xtensa_end
	flag.  Update checks for workaround options.  Call
	xtensa_mark_narrow_branches and xtensa_mark_zcl_first_insns.
	(xtensa_cleanup_align_frags): Add special case for branch targets.
	Check for and mark unreachable frags.
	(xtensa_fix_target_frags): Remove use of align_only_targets flag.
	Use RELAX_LOOP_END_BYTES in special case for negatable branch at the
	end of a zero-overhead loop body.
	(frag_can_negate_branch): Handle instructions with multiple slots.
	Use new xtensa-isa.h functions
	(xtensa_mark_narrow_branches, is_narrow_branch_guaranteed_in_range,
	xtensa_mark_zcl_first_insns): New.
	(xtensa_fix_a0_b_retw_frags, xtensa_fix_b_j_loop_end_frags): Error if
	transformations are disabled.
	(next_instrs_are_b_retw): Use new xtensa-isa.h functions.  Handle
	multislot instructions.
	(xtensa_fix_close_loop_end_frags, xtensa_fix_short_loop_frags):
	Likewise.  Also error if transformations are disabled.
	(unrelaxed_frag_max_size): New.
	(unrelaxed_frag_min_insn_count, unrelax_frag_has_b_j): Use new
	xtensa-isa.h functions.
	(xtensa_sanity_check, is_empty_loop, is_local_forward_loop): Use
	xtensa_opcode_is_loop instead of is_loop_opcode.
	(get_text_align_power): Replace as_fatal with assertion.
	(get_text_align_fill_size): Iterate instead of using modulus when
	use_nops is false.
	(get_noop_aligned_address): Assert that this is for a machine-dependent
	RELAX_ALIGN_NEXT_OPCODE frag.  Use next_frag_opcode_is_loop,
	xg_get_single_size, and frag_format_size.
	(get_widen_aligned_address): Rename to ...
	(get_aligned_diff): ... this function.  Add max_diff parameter.
	Remove handling of rs_align/rs_align_code frags.  Use
	next_frag_format_size, get_text_align_power, get_text_align_fill_size,
	next_frag_opcode_is_loop, and xg_get_single_size.  Compute max_diff
	and pass it back to caller.
	(xtensa_relax_frag): Use relax_frag_loop_align.  Add code for new
	RELAX_SLOTS, RELAX_MAYBE_UNREACHABLE, RELAX_MAYBE_DESIRE_ALIGN,
	RELAX_FILL_NOP, and RELAX_UNREACHABLE frag types.  Check relax_seen.
	(relax_frag_text_align): Rename to ...
	(relax_frag_loop_align): ... this function.  Assume loops can only be
	in the first slot of an instruction.
	(relax_frag_add_nop): Use assemble_nop instead of constructing an OR
	instruction.  Remove call to frag_wane.
	(relax_frag_narrow): Rename to ...
	(relax_frag_for_align): ... this function.  Extend to handle
	RELAX_FILL_NOP and RELAX_UNREACHABLE, as well as RELAX_SLOTS with
	RELAX_NARROW for the first slot.
	(find_address_of_next_align_frag, bytes_to_stretch): New.
	(future_alignment_required): Use find_address_of_next_align_frag and
	bytes_to_stretch.  Look ahead to subsequent frags to make smarter
	alignment decisions.
	(relax_frag_immed): Add format, slot, and estimate_only parameters.
	Check if transformations are enabled for b_j_loop_end workaround.
	Use new xtensa-isa.h functions and handle multislot instructions.
	Update call to xg_assembly_relax.
	(md_convert_frag): Handle new RELAX_SLOTS, RELAX_UNREACHABLE,
	RELAX_MAYBE_UNREACHABLE, RELAX_MAYBE_DESIRE_ALIGN, and RELAX_FILL_NOP
	frag types.
	(convert_frag_narrow): Add segP, format and slot parameters.  Call
	convert_frag_immed for branch instructions.  Adjust calls to
	tinsn_from_chars, tinsn_immed_from_frag, and xg_emit_insn_to_buf.  Use
	xg_get_single_size and xg_get_single_format.
	(convert_frag_fill_nop): New.
	(convert_frag_immed): Add format and slot parameters.  Handle multislot
	instructions and use new xtensa-isa.h functions.  Update calls to
	tinsn_immed_from_frag and xg_assembly_relax.  Check if transformations
	enabled for b_j_loop_end workaround.  Use build_nop instead of
	assemble_nop.  Check is_specific_opcode flag.  Check for unreachable
	frags.  Use xg_get_single_size.  Handle O_pltrel.
	(fix_new_exp_in_seg): Remove check for old plt flag.
	(convert_frag_immed_finish_loop): Update calls to tinsn_from_chars and
	xtensa_insnbuf_to_chars.  Call tinsn_immed_from_frag.  Change check
	for loop opcode to an assertion.  Mark all frags up to the end of the
	loop as not transformable.
	(get_last_insn_flags, set_last_insn_flags): Use get_subseg_info.
	(get_subseg_info): New.
	(xtensa_move_literals): Call xtensa_set_frag_assembly_state.  Add null
	check for dest_seg.
	(xtensa_switch_to_literal_fragment): Rewrite to handle absolute
	literals and use xtensa_switch_to_non_abs_literal_fragment otherwise.
	(xtensa_switch_to_non_abs_literal_fragment): New.
	(cache_literal_section): Add is_code parameter and pass it through to
	retrieve_literal_seg.
	(retrieve_literal_seg): Add is_code parameter and use it to set the
	flags on the literal section.  Handle case where head parameter is 0.
	(get_frag_is_no_transform, set_frag_is_specific_opcode,
	set_frag_is_no_transform): New.
	(xtensa_create_property_segments): Add end_property_function parameter
	and pass it through to add_xt_block_frags.  Call bfd_get_section_flags
	and skip SEC_DEBUGGING and !SEC_ALLOC sections.
	(xtensa_create_xproperty_segments, section_has_xproperty): New.
	(add_xt_block_frags): Add end_property_function parameter and call it
	if it is non-zero.  Call xtensa_frag_flags_init.
	(xtensa_frag_flags_is_empty, xtensa_frag_flags_init,
	get_frag_property_flags, frag_flags_to_number,
	xtensa_frag_flags_combinable, xt_block_aligned_size,
	xtensa_xt_block_combine, add_xt_prop_frags,
	init_op_placement_info_table, opcode_fits_format_slot,
	xg_get_single_size, xg_get_single_format): New.
	(istack_push): Inline call to tinsn_copy.
	(tinsn_copy): Delete.
	(tinsn_has_invalid_symbolic_operands): Handle O_hi16 and O_lo16 and
	CONST16 opcodes.  Handle O_big, O_illegal, and O_absent.
	(tinsn_has_complex_operands): Handle O_hi16 and O_lo16.
	(tinsn_to_insnbuf): Use xg_get_single_format and new xtensa-isa.h
	functions.  Handle invisible operands.
	(tinsn_to_slotbuf): New.
	(tinsn_check_arguments): Use new xtensa-isa.h functions.
	(tinsn_from_chars): Add slot parameter.  Rewrite using xg_init_vinsn,
	vinsn_from_chars, and xg_free_vinsn.
	(tinsn_from_insnbuf): New.
	(tinsn_immed_from_frag): Add slot parameter and handle multislot
	instructions.  Handle symbol differences.
	(get_num_stack_text_bytes): Use xg_get_single_size.
	(xg_init_vinsn, xg_clear_vinsn, vinsn_has_specific_opcodes,
	xg_free_vinsn, vinsn_to_insnbuf, vinsn_from_chars, expr_is_register,
	get_expr_register, set_expr_symbol_offset_diff): New.
	* config/tc-xtensa.h (MAX_SLOTS): Define.
	(xtensa_relax_statesE): Move from tc-xtensa.c. Add
	RELAX_CHECK_ALIGN_NEXT_OPCODE, RELAX_MAYBE_DESIRE_ALIGN, RELAX_SLOTS,
	RELAX_FILL_NOP, RELAX_UNREACHABLE, RELAX_MAYBE_UNREACHABLE, and
	RELAX_NONE types.
	(RELAX_IMMED_MAXSTEPS): Move from tc-xtensa.c.
	(xtensa_frag_type struct): Add is_assembly_state_set,
	use_absolute_literals, relax_seen, is_unreachable, is_specific_opcode,
	is_align, is_text_align, alignment, and is_first_loop_insn fields.
	Replace is_generics and is_relax fields by is_no_transform field.
	Delete is_text and is_longcalls fields.  Change text_expansion and
	literal_expansion to arrays of MAX_SLOTS entries.  Add arrays of
	per-slot information: literal_frags, slot_subtypes, slot_symbols,
	slot_sub_symbols, and slot_offsets.  Add fr_prev field.
	(xtensa_fix_data struct): New.
	(xtensa_symfield_type struct): Delete plt field.
	(xtensa_block_info struct): Move definition to tc-xtensa.h.  Add
	forward declaration here.
	(xt_section_type enum): Delete xt_insn_sec.  Add xt_prop_sec.
	(XTENSA_SECTION_RENAME): Undefine.
	(TC_FIX_TYPE, TC_INIT_FIX_DATA, TC_FORCE_RELOCATION, NO_PSEUDO_DOT,
	tc_unrecognized_line, md_do_align, md_elf_section_change_hook,
	HANDLE_ALIGN, TC_LINKRELAX_FIXUP, SUB_SEGMENT_ALIGN): Define.
	(TC_CONS_FIX_NEW, tc_symbol_new_hook): Delete.
	(unit_num_copies_func, opcode_num_units_func,
	opcode_funcUnit_use_unit_func, opcode_funcUnit_use_stage_func): New.
	(resource_table struct): New.
	* config/xtensa-istack.h (MAX_INSN_ARGS): Increase from 6 to 10.
	(TInsn struct): Add keep_wide, loc, fixup, record_fix, subtype,
	literal_space, symbol, sub_symbol, offset, and literal_frag fields.
	(tinsn_copy): Delete prototype.
	(vliw_insn struct): New.
	* config/xtensa-relax.c (insn_pattern_struct): Add options field.
	(widen_spec_list): Add option conditions for density and boolean
	instructions.  Add expansions using CONST16 and conditions for using
	CONST16 vs. L32R.  Use new Xtensa LX RSR/WSR syntax.  Add entries for
	predicted branches.
	(simplify_spec_list): Add option conditions for density instructions.
	Add entry for NOP instruction.
	(append_transition): Add cmp function pointer parameter and use it to
	insert the new entry in order.
	(operand_function_LOW16U, operand_function_HI16U): New.
	(xg_has_userdef_op_fn, xg_apply_userdef_op_fn): Handle
	OP_OPERAND_LOW16U and OP_OPERAND_HI16U.
	(enter_opname, split_string): Use xstrdup instead of strdup.
	(init_insn_pattern): Initialize new options field.
	(clear_req_or_option_list, clear_req_option_list,
	clone_req_or_option_list, clone_req_option_list, parse_option_cond):
	New.
	(parse_insn_pattern): Parse option conditions.
	(transition_applies): New.
	(build_transition): Use new xtensa-isa.h functions.  Fix incorrectly
	swapped last arguments in calls to append_constant_value_condition.
	Call clone_req_option_list.  Add warning about invalid opcode.
	Handle LOW16U and HI16U function names.
	(build_transition_table): Add cmp parameter and use it in calls to
	append_transition.  Use new xtensa-isa.h functions.  Check
	transition_applies before adding entries.
	(xg_build_widen_table, xg_build_simplify_table): Add cmp parameter and
	pass it through to build_transition_table.
	* config/xtensa-relax.h (ReqOrOptionList, ReqOrOption, ReqOptionList,
	ReqOption, transition_cmp_fn): New types.
	(OpType enum): Add OP_OPERAND_LOW16U and OP_OPERAND_HI16U.
	(transition_rule struct): Add options field.
	* doc/as.texinfo (Overview): Update Xtensa options.
	* doc/c-xtensa.texi (Xtensa Options): Delete --[no-]density,
	--[no-]relax, and --[no-]generics options.  Update descriptions of
	--text-section-literals and --[no-]longcalls.  Add
	--[no-]absolute-literals and --[no-]transform.
	(Xtensa Syntax): Add description of syntax for FLIX instructions.
	Remove use of "generic" and "specific" terminology for opcodes.
	(Xtensa Registers): Generalize the syntax description to include
	user-defined register files.
	(Xtensa Automatic Alignment): Update.
	(Xtensa Branch Relaxation): Mention limitation of unconditional jumps.
	(Xtensa Call Relaxation): Linker can now remove most of the overhead.
	(Xtensa Directives): Remove confusing rules about precedence.
	(Density Directive, Relax Directive): Delete.
	(Schedule Directive): New.
	(Generics Directive): Rename to ...
	(Transform Directive): ... this node.
	(Literal Directive): Update for absolute literals.  Missing
	literal_position directive is now an error.
	(Literal Position Directive): Update for absolute literals.
	(Freeregs Directive): Delete.
	(Absolute Literals Directive): New.
	(Frame Directive): Minor editing.
	* Makefile.am (DEPTC_xtensa_elf, DEPOBJ_xtensa_elf, DEP_xtensa_elf):
	Update dependencies.
	* Makefile.in: Regenerate.

gas/testsuite ChangeLog

	* gas/xtensa/all.exp: Adjust expected error message for j_too_far.
	Change entry_align test to expect an error.
	* gas/xtensa/entry_misalign2.s: Use no-transform instead of
	no-generics directives.

include ChangeLog

	* xtensa-config.h (XSHAL_USE_ABSOLUTE_LITERALS,
	XCHAL_HAVE_PREDICTED_BRANCHES, XCHAL_INST_FETCH_WIDTH): New.
	(XCHAL_EXTRA_SA_SIZE, XCHAL_EXTRA_SA_ALIGN): Delete.
	* xtensa-isa-internal.h (ISA_INTERFACE_VERSION): Delete.
	(config_sturct struct): Delete.
	(XTENSA_OPERAND_IS_REGISTER, XTENSA_OPERAND_IS_PCRELATIVE,
	XTENSA_OPERAND_IS_INVISIBLE, XTENSA_OPERAND_IS_UNKNOWN,
	XTENSA_OPCODE_IS_BRANCH, XTENSA_OPCODE_IS_JUMP,
	XTENSA_OPCODE_IS_LOOP, XTENSA_OPCODE_IS_CALL,
	XTENSA_STATE_IS_EXPORTED, XTENSA_INTERFACE_HAS_SIDE_EFFECT): Define.
	(xtensa_format_encode_fn, xtensa_get_slot_fn, xtensa_set_slot_fn): New.
	(xtensa_insn_decode_fn): Rename to ...
	(xtensa_opcode_decode_fn): ... this.
	(xtensa_immed_decode_fn, xtensa_immed_encode_fn, xtensa_do_reloc_fn,
	xtensa_undo_reloc_fn): Update.
	(xtensa_encoding_template_fn): Delete.
	(xtensa_opcode_encode_fn, xtensa_format_decode_fn,
	xtensa_length_decode_fn): New.
	(xtensa_format_internal, xtensa_slot_internal): New types.
	(xtensa_operand_internal): Delete operand_kind, inout, isPCRelative,
	get_field, and set_field fields.  Add name, field_id, regfile,
	num_regs, and flags fields.
	(xtensa_arg_internal): New type.
	(xtensa_iclass_internal): Change operands field to array of
	xtensa_arg_internal.  Add num_stateOperands, stateOperands,
	num_interfaceOperands, and interfaceOperands fields.
	(xtensa_opcode_internal): Delete length, template, and iclass fields.
	Add iclass_id, flags, encode_fns, num_funcUnit_uses, and funcUnit_uses.
	(opname_lookup_entry): Delete.
	(xtensa_regfile_internal, xtensa_interface_internal,
	xtensa_funcUnit_internal, xtensa_state_internal,
	xtensa_sysreg_internal, xtensa_lookup_entry): New.
	(xtensa_isa_internal): Replace opcode_table field with opcodes field.
	Change type of opname_lookup_table.  Delete num_modules,
	module_opcode_base, module_decode_fn, config, and has_density fields.
	Add num_formats, formats, format_decode_fn, length_decode_fn,
	num_slots, slots, num_fields, num_operands, operands, num_iclasses,
	iclasses, num_regfiles, regfiles, num_states, states,
	state_lookup_table, num_sysregs, sysregs, sysreg_lookup_table,
	max_sysreg_num, sysreg_table, num_interfaces, interfaces,
	interface_lookup_table, num_funcUnits, funcUnits and
	funcUnit_lookup_table fields.
	(xtensa_isa_module, xtensa_isa_modules): Delete.
	(xtensa_isa_name_compare): New prototype.
	(xtisa_errno, xtisa_error_msg): New.
	* xtensa-isa.h (XTENSA_ISA_VERSION): Define.
	(xtensa_isa): Change type.
	(xtensa_operand): Delete.
	(xtensa_format, xtensa_regfile, xtensa_state, xtensa_sysreg,
	xtensa_interface, xtensa_funcUnit, xtensa_isa_status,
	xtensa_funcUnit_use): New types.
	(libisa_module_specifier): Delete.
	(xtensa_isa_errno, xtensa_isa_error_msg): New prototypes.
	(xtensa_insnbuf_free, xtensa_insnbuf_to_chars,
	xtensa_insnbuf_from_chars): Update prototypes.
	(xtensa_load_isa, xtensa_extend_isa, xtensa_default_isa,
	xtensa_insn_maxlength, xtensa_num_opcodes, xtensa_decode_insn,
	xtensa_encode_insn, xtensa_insn_length,
	xtensa_insn_length_from_first_byte, xtensa_num_operands,
	xtensa_operand_kind, xtensa_encode_result,
	xtensa_operand_isPCRelative): Delete.
	(xtensa_isa_init, xtensa_operand_inout, xtensa_operand_get_field,
	xtensa_operand_set_field, xtensa_operand_encode,
	xtensa_operand_decode, xtensa_operand_do_reloc,
	xtensa_operand_undo_reloc): Update prototypes.
	(xtensa_isa_maxlength, xtensa_isa_length_from_chars,
	xtensa_isa_num_pipe_stages, xtensa_isa_num_formats,
	xtensa_isa_num_opcodes, xtensa_isa_num_regfiles, xtensa_isa_num_states,
	xtensa_isa_num_sysregs, xtensa_isa_num_interfaces,
	xtensa_isa_num_funcUnits, xtensa_format_name, xtensa_format_lookup,
	xtensa_format_decode, xtensa_format_encode, xtensa_format_length,
	xtensa_format_num_slots, xtensa_format_slot_nop_opcode,
	xtensa_format_get_slot, xtensa_format_set_slot, xtensa_opcode_decode,
	xtensa_opcode_encode, xtensa_opcode_is_branch, xtensa_opcode_is_jump,
	xtensa_opcode_is_loop, xtensa_opcode_is_call,
	xtensa_opcode_num_operands, xtensa_opcode_num_stateOperands,
	xtensa_opcode_num_interfaceOperands, xtensa_opcode_num_funcUnit_uses,
	xtensa_opcode_funcUnit_use, xtensa_operand_name,
	xtensa_operand_is_visible, xtensa_operand_is_register,
	xtensa_operand_regfile, xtensa_operand_num_regs,
	xtensa_operand_is_known_reg, xtensa_operand_is_PCrelative,
	xtensa_stateOperand_state, xtensa_stateOperand_inout,
	xtensa_interfaceOperand_interface, xtensa_regfile_lookup,
	xtensa_regfile_lookup_shortname, xtensa_regfile_name,
	xtensa_regfile_shortname, xtensa_regfile_view_parent,
	xtensa_regfile_num_bits, xtensa_regfile_num_entries,
	xtensa_state_lookup, xtensa_state_name, xtensa_state_num_bits,
	xtensa_state_is_exported, xtensa_sysreg_lookup,
	xtensa_sysreg_lookup_name, xtensa_sysreg_name, xtensa_sysreg_number,
	xtensa_sysreg_is_user, xtensa_interface_lookup, xtensa_interface_name,
	xtensa_interface_num_bits, xtensa_interface_inout,
	xtensa_interface_has_side_effect, xtensa_funcUnit_lookup,
	xtensa_funcUnit_name, xtensa_funcUnit_num_copies): New prototypes.
	* elf/xtensa.h (R_XTENSA_DIFF8, R_XTENSA_DIFF16, R_XTENSA_DIFF32,
	R_XTENSA_SLOT*_OP, R_XTENSA_SLOT*_ALT): New relocations.
	(XTENSA_PROP_SEC_NAME): Define.
	(property_table_entry): Add flags field.
	(XTENSA_PROP_*, GET_XTENSA_PROP_*, SET_XTENSA_PROP_*): Define.

ld ChangeLog

	* ld.texinfo (Xtensa): Describe new linker relaxation to optimize
	assembler-generated longcall sequences.  Describe new --size-opt
	option.
	* emulparams/elf32xtensa.sh (OTHER_SECTIONS): Add .xt.prop section.
	* emultempl/xtensaelf.em (remove_section,
	replace_insn_sec_with_prop_sec, replace_instruction_table_sections,
	elf_xtensa_after_open): New.
	(OPTION_OPT_SIZEOPT, OPTION_LITERAL_MOVEMENT,
	OPTION_NO_LITERAL_MOVEMENT): Define.
	(elf32xtensa_size_opt, elf32xtensa_no_literal_movement): New globals.
	(PARSE_AND_LIST_LONGOPTS): Add size-opt and [no-]literal-movement.
	(PARSE_AND_LIST_OPTIONS): Add --size-opt.
	(PARSE_AND_LIST_ARGS_CASES): Handle OPTION_OPT_SIZEOPT,
	OPTION_LITERAL_MOVEMENT, and OPTION_NO_LITERAL_MOVEMENT.
	(LDEMUL_AFTER_OPEN): Set to elf_xtensa_after_open.
	* scripttempl/elfxtensa.sc: Update with changes from elf.sc.
	* Makefile.am (eelf32xtensa.c): Update dependencies.
	* Makefile.in: Regenerate.

ld/testsuite ChangeLog

	* ld-xtensa/lcall1.s: Use .literal directive.
	* ld-xtensa/lcall2.s: Align function entry.
	* ld-xtensa/coalesce2.s: Likewise.

opcodes ChangeLog

	* xtensa-dis.c (state_names): Delete.
	(fetch_data): Use xtensa_isa_maxlength.
	(print_xtensa_operand): Replace operand parameter with opcode/operand
	pair.  Remove print_sr_name parameter.  Use new xtensa-isa.h functions.
	(print_insn_xtensa): Use new xtensa-isa.h functions.  Handle multislot
	instruction bundles.  Use xmalloc instead of malloc.

1 files changed, 1484 insertions, 336 deletions

diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c
index 761e5c6..30ad80c 100644
--- a/bfd/xtensa-isa.c
+++ b/bfd/xtensa-isa.c
@@ -1,5 +1,5 @@
 /* Configurable Xtensa ISA support.
-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -17,342 +17,709 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <string.h>
-
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
 #include "xtensa-isa.h"
 #include "xtensa-isa-internal.h"
 
-xtensa_isa xtensa_default_isa = NULL;
+xtensa_isa_status xtisa_errno;
+char xtisa_error_msg[1024];
+
 
-static int
-opname_lookup_compare (const void *v1, const void *v2)
+xtensa_isa_status
+xtensa_isa_errno (xtensa_isa isa __attribute__ ((unused)))
 {
-  opname_lookup_entry *e1 = (opname_lookup_entry *)v1;
-  opname_lookup_entry *e2 = (opname_lookup_entry *)v2;
+  return xtisa_errno;
+}
 
-  return strcmp (e1->key, e2->key);
+
+char *
+xtensa_isa_error_msg (xtensa_isa isa __attribute__ ((unused)))
+{
+  return xtisa_error_msg;
 }
 
 
-xtensa_isa
-xtensa_isa_init (void)
+#define CHECK_ALLOC(MEM,ERRVAL) \
+  do { \
+    if ((MEM) == 0) \
+      { \
+	xtisa_errno = xtensa_isa_out_of_memory; \
+	strcpy (xtisa_error_msg, "out of memory"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+#define CHECK_ALLOC_FOR_INIT(MEM,ERRVAL,ERRNO_P,ERROR_MSG_P) \
+  do { \
+    if ((MEM) == 0) \
+      { \
+	xtisa_errno = xtensa_isa_out_of_memory; \
+	strcpy (xtisa_error_msg, "out of memory"); \
+	if (ERRNO_P) *(ERRNO_P) = xtisa_errno; \
+	if (ERROR_MSG_P) *(ERROR_MSG_P) = xtisa_error_msg; \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+/* Instruction buffers.  */
+
+int
+xtensa_insnbuf_size (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->insnbuf_size;
+}
+
+
+xtensa_insnbuf
+xtensa_insnbuf_alloc (xtensa_isa isa)
+{
+  xtensa_insnbuf result = (xtensa_insnbuf)
+    malloc (xtensa_insnbuf_size (isa) * sizeof (xtensa_insnbuf_word));
+  CHECK_ALLOC (result, 0);
+  return result;
+}
+
+
+void
+xtensa_insnbuf_free (xtensa_isa isa __attribute__ ((unused)),
+		     xtensa_insnbuf buf)
+{
+  free (buf);
+}
+
+
+/* Given <byte_index>, the index of a byte in a xtensa_insnbuf, our
+   internal representation of a xtensa instruction word, return the index of
+   its word and the bit index of its low order byte in the xtensa_insnbuf.  */
+
+static inline int
+byte_to_word_index (int byte_index)
+{
+  return byte_index / sizeof (xtensa_insnbuf_word);
+}
+
+
+static inline int
+byte_to_bit_index (int byte_index)
+{
+  return (byte_index & 0x3) * 8;
+}
+
+
+/* Copy an instruction in the 32-bit words pointed at by "insn" to
+   characters pointed at by "cp".  This is more complicated than you
+   might think because we want 16-bit instructions in bytes 2 & 3 for
+   big-endian configurations.  This function allows us to specify
+   which byte in "insn" to start with and which way to increment,
+   allowing trivial implementation for both big- and little-endian
+   configurations....and it seems to make pretty good code for
+   both.  */
+
+int
+xtensa_insnbuf_to_chars (xtensa_isa isa, const xtensa_insnbuf insn, char *cp,
+			 int num_chars)
 {
-  xtensa_isa isa;
-  int mod;
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int insn_size = xtensa_isa_maxlength (isa);
+  int fence_post, start, increment, i, byte_count;
+  xtensa_format fmt;
+
+  if (num_chars == 0)
+    num_chars = insn_size;
 
-  isa = xtensa_load_isa (0);
-  if (isa == 0)
+  if (intisa->is_big_endian)
     {
-      fprintf (stderr, "Failed to initialize Xtensa base ISA module\n");
-      return NULL;
+      start = insn_size - 1;
+      increment = -1;
+    }
+  else
+    {
+      start = 0;
+      increment = 1;
     }
 
-  for (mod = 1; xtensa_isa_modules[mod].get_num_opcodes_fn; mod++)
+  /* Find the instruction format.  Do nothing if the buffer does not contain
+     a valid instruction since we need to know how many bytes to copy.  */
+  fmt = xtensa_format_decode (isa, insn);
+  if (fmt == XTENSA_UNDEFINED)
+    return XTENSA_UNDEFINED;
+
+  byte_count = xtensa_format_length (isa, fmt);
+  if (byte_count == XTENSA_UNDEFINED)
+    return XTENSA_UNDEFINED;
+
+  if (byte_count > num_chars)
     {
-      if (!xtensa_extend_isa (isa, mod))
-	{
-	  fprintf (stderr, "Failed to initialize Xtensa TIE ISA module\n");
-	  return NULL;
-	}
+      xtisa_errno = xtensa_isa_buffer_overflow;
+      strcpy (xtisa_error_msg, "output buffer too small for instruction");
+      return XTENSA_UNDEFINED;
     }
 
-  return isa;
+  fence_post = start + (byte_count * increment);
+
+  for (i = start; i != fence_post; i += increment, ++cp)
+    {
+      int word_inx = byte_to_word_index (i);
+      int bit_inx = byte_to_bit_index (i);
+
+      *cp = (insn[word_inx] >> bit_inx) & 0xff;
+    }
+
+  return byte_count;
 }
 
-/* ISA information.  */
 
-static int
-xtensa_check_isa_config (xtensa_isa_internal *isa,
-			 struct config_struct *config_table)
+/* Inward conversion from byte stream to xtensa_insnbuf.  See
+   xtensa_insnbuf_to_chars for a discussion of why this is complicated
+   by endianness.  */
+    
+void
+xtensa_insnbuf_from_chars (xtensa_isa isa, xtensa_insnbuf insn, const char *cp,
+			   int num_chars)
 {
-  int i, j;
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int max_size, insn_size, fence_post, start, increment, i;
+
+  max_size = xtensa_isa_maxlength (isa);
+
+  /* Decode the instruction length so we know how many bytes to read.  */
+  insn_size = (intisa->length_decode_fn) (cp);
+  if (insn_size == XTENSA_UNDEFINED)
+    {
+      /* This should never happen when the byte stream contains a
+	 valid instruction.  Just read the maximum number of bytes....  */
+      insn_size = max_size;
+    }
+
+  if (num_chars == 0 || num_chars > insn_size)
+    num_chars = insn_size;
 
-  if (!config_table)
+  if (intisa->is_big_endian)
+    {
+      start = max_size - 1;
+      increment = -1;
+    }
+  else
     {
-      fprintf (stderr, "Error: Empty configuration table in ISA DLL\n");
-      return 0;
+      start = 0;
+      increment = 1;
     }
 
-  /* For the first module, save a pointer to the table and record the
-     specified endianness and availability of the density option.  */
+  fence_post = start + (num_chars * increment);
+  memset (insn, 0, xtensa_insnbuf_size (isa) * sizeof (xtensa_insnbuf_word));
 
-  if (isa->num_modules == 0)
+  for (i = start; i != fence_post; i += increment, ++cp)
     {
-      int found_memory_order = 0;
+      int word_inx = byte_to_word_index (i);
+      int bit_inx = byte_to_bit_index (i);
+
+      insn[word_inx] |= (*cp & 0xff) << bit_inx;
+    }
+}
 
-      isa->config = config_table;
-      isa->has_density = 1;  /* Default to have density option.  */
 
-      for (i = 0; config_table[i].param_name; i++)
-	{
-	  if (!strcmp (config_table[i].param_name, "IsaMemoryOrder"))
-	    {
-	      isa->is_big_endian =
-		(strcmp (config_table[i].param_value, "BigEndian") == 0);
-	      found_memory_order = 1;
-	    }
-	  if (!strcmp (config_table[i].param_name, "IsaUseDensityInstruction"))
-	    {
-	      isa->has_density = atoi (config_table[i].param_value);
-	    }
-	}
-      if (!found_memory_order)
-	{
-	  fprintf (stderr, "Error: \"IsaMemoryOrder\" missing from "
-		   "configuration table in ISA DLL\n");
-	  return 0;
-	}
+
+/* ISA information.  */
 
-      return 1;
+extern xtensa_isa_internal xtensa_modules;
+
+xtensa_isa
+xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p)
+{
+  xtensa_isa_internal *isa = &xtensa_modules;
+  int n, is_user;
+
+  /* Set up the opcode name lookup table.  */
+  isa->opname_lookup_table =
+    bfd_malloc (isa->num_opcodes * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->opname_lookup_table, NULL, errno_p, error_msg_p);
+  for (n = 0; n < isa->num_opcodes; n++)
+    {
+      isa->opname_lookup_table[n].key = isa->opcodes[n].name;
+      isa->opname_lookup_table[n].u.opcode = n;
     }
+  qsort (isa->opname_lookup_table, isa->num_opcodes,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
 
-  /* For subsequent modules, check that the parameters match.  Note: This
-     code is sufficient to handle the current model where there are never
-     more than 2 modules; we might at some point want to handle cases where
-     module N > 0 specifies some parameters not included in the base table,
-     and we would then add those to isa->config so that subsequent modules
-     would check against them. */
+  /* Set up the state name lookup table.  */
+  isa->state_lookup_table =
+    bfd_malloc (isa->num_states * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->state_lookup_table, NULL, errno_p, error_msg_p);
+  for (n = 0; n < isa->num_states; n++)
+    {
+      isa->state_lookup_table[n].key = isa->states[n].name;
+      isa->state_lookup_table[n].u.state = n;
+    }
+  qsort (isa->state_lookup_table, isa->num_states,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  /* Set up the sysreg name lookup table.  */
+  isa->sysreg_lookup_table =
+    bfd_malloc (isa->num_sysregs * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->sysreg_lookup_table, NULL, errno_p, error_msg_p);
+  for (n = 0; n < isa->num_sysregs; n++)
+    {
+      isa->sysreg_lookup_table[n].key = isa->sysregs[n].name;
+      isa->sysreg_lookup_table[n].u.sysreg = n;
+    }
+  qsort (isa->sysreg_lookup_table, isa->num_sysregs,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
 
-  for (i = 0; config_table[i].param_name; i++)
+  /* Set up the user & system sysreg number tables.  */
+  for (is_user = 0; is_user < 2; is_user++)
     {
-      for (j = 0; isa->config[j].param_name; j++)
-	{
-	  if (!strcmp (config_table[i].param_name, isa->config[j].param_name))
-	    {
-	      int mismatch;
-	      if (!strcmp (config_table[i].param_name, "IsaCoprocessorCount"))
-		{
-		  /* Only require the coprocessor count to be <= the base.  */
-		  int tiecnt = atoi (config_table[i].param_value);
-		  int basecnt = atoi (isa->config[j].param_value);
-		  mismatch = (tiecnt > basecnt);
-		}
-	      else
-		mismatch = strcmp (config_table[i].param_value,
-				   isa->config[j].param_value);
-	      if (mismatch)
-		{
-#define MISMATCH_MESSAGE \
-"Error: Configuration mismatch in the \"%s\" parameter:\n\
-the configuration used when the TIE file was compiled had a value of\n\
-\"%s\", while the current configuration has a value of\n\
-\"%s\". Please rerun the TIE compiler with a matching\n\
-configuration.\n"
-		  fprintf (stderr, MISMATCH_MESSAGE,
-			   config_table[i].param_name,
-			   config_table[i].param_value,
-			   isa->config[j].param_value);
-		  return 0;
-		}
-	      break;
-	    }
-	}
+      isa->sysreg_table[is_user] =
+	bfd_malloc ((isa->max_sysreg_num[is_user] + 1)
+		    * sizeof (xtensa_sysreg));
+      CHECK_ALLOC_FOR_INIT (isa->sysreg_table[is_user], NULL,
+			    errno_p, error_msg_p);
+
+      for (n = 0; n <= isa->max_sysreg_num[is_user]; n++)
+	isa->sysreg_table[is_user][n] = XTENSA_UNDEFINED;
+    }
+  for (n = 0; n < isa->num_sysregs; n++)
+    {
+      xtensa_sysreg_internal *sreg = &isa->sysregs[n];
+      is_user = sreg->is_user;
+
+      isa->sysreg_table[is_user][sreg->number] = n;
+    }
+
+  /* Set up the interface lookup table.  */
+  isa->interface_lookup_table = 
+    bfd_malloc (isa->num_interfaces * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->interface_lookup_table, NULL, errno_p,
+			error_msg_p);
+  for (n = 0; n < isa->num_interfaces; n++)
+    {
+      isa->interface_lookup_table[n].key = isa->interfaces[n].name;
+      isa->interface_lookup_table[n].u.intf = n;
+    }
+  qsort (isa->interface_lookup_table, isa->num_interfaces,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  /* Set up the funcUnit lookup table.  */
+  isa->funcUnit_lookup_table = 
+    bfd_malloc (isa->num_funcUnits * sizeof (xtensa_lookup_entry));
+  CHECK_ALLOC_FOR_INIT (isa->funcUnit_lookup_table, NULL, errno_p,
+			error_msg_p);
+  for (n = 0; n < isa->num_funcUnits; n++)
+    {
+      isa->funcUnit_lookup_table[n].key = isa->funcUnits[n].name;
+      isa->funcUnit_lookup_table[n].u.fun = n;
     }
+  qsort (isa->funcUnit_lookup_table, isa->num_funcUnits,
+	 sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
 
-  return 1;
+  isa->insnbuf_size = ((isa->insn_size + sizeof (xtensa_insnbuf_word) - 1) /
+		       sizeof (xtensa_insnbuf_word));
+
+  return (xtensa_isa) isa;
 }
 
 
-static int
-xtensa_add_isa (xtensa_isa_internal *isa, libisa_module_specifier libisa)
+void
+xtensa_isa_free (xtensa_isa isa)
 {
-  int (*get_num_opcodes_fn) (void);
-  struct config_struct *(*get_config_table_fn) (void);
-  xtensa_opcode_internal **(*get_opcodes_fn) (void);
-  int (*decode_insn_fn) (const xtensa_insnbuf);
-  xtensa_opcode_internal **opcodes;
-  int opc, insn_size, prev_num_opcodes, new_num_opcodes, this_module;
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int n;
 
-  get_num_opcodes_fn = xtensa_isa_modules[libisa].get_num_opcodes_fn;
-  get_opcodes_fn = xtensa_isa_modules[libisa].get_opcodes_fn;
-  decode_insn_fn = xtensa_isa_modules[libisa].decode_insn_fn;
-  get_config_table_fn = xtensa_isa_modules[libisa].get_config_table_fn;
+  /* With this version of the code, the xtensa_isa structure is not
+     dynamically allocated, so this function is not essential.  Free
+     the memory allocated by xtensa_isa_init and restore the xtensa_isa
+     structure to its initial state.  */
 
-  if (!get_num_opcodes_fn || !get_opcodes_fn || !decode_insn_fn
-      || (!get_config_table_fn && isa->num_modules == 0))
-    return 0;
-
-  if (get_config_table_fn
-      && !xtensa_check_isa_config (isa, get_config_table_fn ()))
-    return 0;
+  if (intisa->opname_lookup_table)
+    {
+      free (intisa->opname_lookup_table);
+      intisa->opname_lookup_table = 0;
+    }
 
-  prev_num_opcodes = isa->num_opcodes;
-  new_num_opcodes = (*get_num_opcodes_fn) ();
+  if (intisa->state_lookup_table)
+    {
+      free (intisa->state_lookup_table);
+      intisa->state_lookup_table = 0;
+    }
 
-  isa->num_opcodes += new_num_opcodes;
-  isa->opcode_table = (xtensa_opcode_internal **)
-    realloc (isa->opcode_table, isa->num_opcodes *
-	     sizeof (xtensa_opcode_internal *));
-  isa->opname_lookup_table = (opname_lookup_entry *)
-    realloc (isa->opname_lookup_table, isa->num_opcodes *
-	     sizeof (opname_lookup_entry));
+  if (intisa->sysreg_lookup_table)
+    {
+      free (intisa->sysreg_lookup_table);
+      intisa->sysreg_lookup_table = 0;
+    }
+  for (n = 0; n < 2; n++)
+    {
+      if (intisa->sysreg_table[n])
+	{
+	  free (intisa->sysreg_table[n]);
+	  intisa->sysreg_table[n] = 0;
+	}
+    }
 
-  opcodes = (*get_opcodes_fn) ();
+  if (intisa->interface_lookup_table)
+    {
+      free (intisa->interface_lookup_table);
+      intisa->interface_lookup_table = 0;
+    }
 
-  insn_size = isa->insn_size;
-  for (opc = 0; opc < new_num_opcodes; opc++)
+  if (intisa->funcUnit_lookup_table)
     {
-      xtensa_opcode_internal *intopc = opcodes[opc];
-      int newopc = prev_num_opcodes + opc;
-      isa->opcode_table[newopc] = intopc;
-      isa->opname_lookup_table[newopc].key = intopc->name;
-      isa->opname_lookup_table[newopc].opcode = newopc;
-      if (intopc->length > insn_size)
-	insn_size = intopc->length;
+      free (intisa->funcUnit_lookup_table);
+      intisa->funcUnit_lookup_table = 0;
     }
+}
 
-  isa->insn_size = insn_size;
-  isa->insnbuf_size = ((isa->insn_size + sizeof (xtensa_insnbuf_word) - 1) /
-		       sizeof (xtensa_insnbuf_word));
 
-  qsort (isa->opname_lookup_table, isa->num_opcodes,
-	 sizeof (opname_lookup_entry), opname_lookup_compare);
+int
+xtensa_isa_name_compare (const void *v1, const void *v2)
+{
+  xtensa_lookup_entry *e1 = (xtensa_lookup_entry *) v1;
+  xtensa_lookup_entry *e2 = (xtensa_lookup_entry *) v2;
+
+  return strcasecmp (e1->key, e2->key);
+}
+
+
+int
+xtensa_isa_maxlength (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->insn_size;
+}
+
+
+int
+xtensa_isa_length_from_chars (xtensa_isa isa, const char *cp)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return (intisa->length_decode_fn) (cp);
+}
+
+
+int
+xtensa_isa_num_pipe_stages (xtensa_isa isa) 
+{
+  int num_opcodes, num_uses;
+  xtensa_opcode opcode;
+  xtensa_funcUnit_use *use;
+  int i, stage, max_stage = XTENSA_UNDEFINED;
 
-  /* Check for duplicate opcode names.  */
-  for (opc = 1; opc < isa->num_opcodes; opc++)
+  num_opcodes = xtensa_isa_num_opcodes (isa);
+  for (opcode = 0; opcode < num_opcodes; opcode++)
     {
-      if (!opname_lookup_compare (&isa->opname_lookup_table[opc-1],
-				  &isa->opname_lookup_table[opc]))
+      num_uses = xtensa_opcode_num_funcUnit_uses (isa, opcode);
+      for (i = 0; i < num_uses; i++)
 	{
-	  fprintf (stderr, "Error: Duplicate TIE opcode \"%s\"\n",
-		   isa->opname_lookup_table[opc].key);
-	  return 0;
+	  use = xtensa_opcode_funcUnit_use (isa, opcode, i);
+	  stage = use->stage;
+	  if (stage > max_stage)
+	    max_stage = stage;
 	}
     }
 
-  this_module = isa->num_modules;
-  isa->num_modules += 1;
+  return max_stage + 1;
+}
+
+
+int
+xtensa_isa_num_formats (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_formats;
+}
 
-  isa->module_opcode_base = (int *) realloc (isa->module_opcode_base,
-					     isa->num_modules * sizeof (int));
-  isa->module_decode_fn = (xtensa_insn_decode_fn *)
-    realloc (isa->module_decode_fn, isa->num_modules *
-	     sizeof (xtensa_insn_decode_fn));
 
-  isa->module_opcode_base[this_module] = prev_num_opcodes;
-  isa->module_decode_fn[this_module] = decode_insn_fn;
+int
+xtensa_isa_num_opcodes (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_opcodes;
+}
 
-  xtensa_default_isa = isa;
 
-  return 1;	/* Library was successfully added.  */
+int
+xtensa_isa_num_regfiles (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_regfiles;
 }
 
 
-xtensa_isa
-xtensa_load_isa (libisa_module_specifier libisa)
+int
+xtensa_isa_num_states (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_states;
+}
+
+
+int
+xtensa_isa_num_sysregs (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_sysregs;
+}
+
+
+int
+xtensa_isa_num_interfaces (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_interfaces;
+}
+
+
+int
+xtensa_isa_num_funcUnits (xtensa_isa isa)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  return intisa->num_funcUnits;
+}
+
+
+
+/* Instruction formats.  */
+
+
+#define CHECK_FORMAT(INTISA,FMT,ERRVAL) \
+  do { \
+    if ((FMT) < 0 || (FMT) >= (INTISA)->num_formats) \
+      { \
+	xtisa_errno = xtensa_isa_bad_format; \
+	strcpy (xtisa_error_msg, "invalid format specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+#define CHECK_SLOT(INTISA,FMT,SLOT,ERRVAL) \
+  do { \
+    if ((SLOT) < 0 || (SLOT) >= (INTISA)->formats[FMT].num_slots) \
+      { \
+	xtisa_errno = xtensa_isa_bad_slot; \
+	strcpy (xtisa_error_msg, "invalid slot specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+const char *
+xtensa_format_name (xtensa_isa isa, xtensa_format fmt)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FORMAT (intisa, fmt, NULL);
+  return intisa->formats[fmt].name;
+}
+
+
+xtensa_format
+xtensa_format_lookup (xtensa_isa isa, const char *fmtname)
 {
-  xtensa_isa_internal *isa;
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int fmt;
 
-  isa = (xtensa_isa_internal *) malloc (sizeof (xtensa_isa_internal));
-  memset (isa, 0, sizeof (xtensa_isa_internal));
-  if (!xtensa_add_isa (isa, libisa))
+  if (!fmtname || !*fmtname)
     {
-      xtensa_isa_free (isa);
-      return NULL;
+      xtisa_errno = xtensa_isa_bad_format;
+      strcpy (xtisa_error_msg, "invalid format name");
+      return XTENSA_UNDEFINED;
     }
-  return (xtensa_isa) isa;
+
+  for (fmt = 0; fmt < intisa->num_formats; fmt++)
+    {
+      if (strcasecmp (fmtname, intisa->formats[fmt].name) == 0)
+	return fmt;
+    }
+  
+  xtisa_errno = xtensa_isa_bad_format;
+  sprintf (xtisa_error_msg, "format \"%s\" not recognized", fmtname);
+  return XTENSA_UNDEFINED;
+}
+
+
+xtensa_format
+xtensa_format_decode (xtensa_isa isa, const xtensa_insnbuf insn)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_format fmt;
+
+  fmt = (intisa->format_decode_fn) (insn);
+  if (fmt != XTENSA_UNDEFINED)
+    return fmt;
+
+  xtisa_errno = xtensa_isa_bad_format;
+  strcpy (xtisa_error_msg, "cannot decode instruction format");
+  return XTENSA_UNDEFINED;
 }
 
 
 int
-xtensa_extend_isa (xtensa_isa isa, libisa_module_specifier libisa)
+xtensa_format_encode (xtensa_isa isa, xtensa_format fmt, xtensa_insnbuf insn)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  return xtensa_add_isa (intisa, libisa);
+  CHECK_FORMAT (intisa, fmt, -1);
+  (*intisa->formats[fmt].encode_fn) (insn);
+  return 0;
 }
 
 
-void
-xtensa_isa_free (xtensa_isa isa)
+int
+xtensa_format_length (xtensa_isa isa, xtensa_format fmt)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  if (intisa->opcode_table)
-    free (intisa->opcode_table);
-  if (intisa->opname_lookup_table)
-    free (intisa->opname_lookup_table);
-  if (intisa->module_opcode_base)
-    free (intisa->module_opcode_base);
-  if (intisa->module_decode_fn)
-    free (intisa->module_decode_fn);
-  free (intisa);
+  CHECK_FORMAT (intisa, fmt, XTENSA_UNDEFINED);
+  return intisa->formats[fmt].length;
 }
 
 
 int
-xtensa_insn_maxlength (xtensa_isa isa)
+xtensa_format_num_slots (xtensa_isa isa, xtensa_format fmt)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  return intisa->insn_size;
+  CHECK_FORMAT (intisa, fmt, XTENSA_UNDEFINED);
+  return intisa->formats[fmt].num_slots;
+}
+
+
+xtensa_opcode
+xtensa_format_slot_nop_opcode (xtensa_isa isa, xtensa_format fmt, int slot)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int slot_id;
+
+  CHECK_FORMAT (intisa, fmt, XTENSA_UNDEFINED);
+  CHECK_SLOT (intisa, fmt, slot, XTENSA_UNDEFINED);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  return xtensa_opcode_lookup (isa, intisa->slots[slot_id].nop_name);
 }
 
 
 int
-xtensa_insnbuf_size (xtensa_isa isa)
+xtensa_format_get_slot (xtensa_isa isa, xtensa_format fmt, int slot,
+			const xtensa_insnbuf insn, xtensa_insnbuf slotbuf)
 {
-  xtensa_isa_internal *intisa = (xtensa_isa_internal *)isa;
-  return intisa->insnbuf_size;
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int slot_id;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  (*intisa->slots[slot_id].get_fn) (insn, slotbuf);
+  return 0;
 }
 
 
 int
-xtensa_num_opcodes (xtensa_isa isa)
+xtensa_format_set_slot (xtensa_isa isa, xtensa_format fmt, int slot,
+			xtensa_insnbuf insn, const xtensa_insnbuf slotbuf)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  return intisa->num_opcodes;
+  int slot_id;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  (*intisa->slots[slot_id].set_fn) (insn, slotbuf);
+  return 0;
 }
 
 
+
+/* Opcode information.  */
+
+
+#define CHECK_OPCODE(INTISA,OPC,ERRVAL) \
+  do { \
+    if ((OPC) < 0 || (OPC) >= (INTISA)->num_opcodes) \
+      { \
+	xtisa_errno = xtensa_isa_bad_opcode; \
+	strcpy (xtisa_error_msg, "invalid opcode specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
 xtensa_opcode
 xtensa_opcode_lookup (xtensa_isa isa, const char *opname)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  opname_lookup_entry entry, *result;
+  xtensa_lookup_entry entry, *result;
+
+  if (!opname || !*opname)
+    {
+      xtisa_errno = xtensa_isa_bad_opcode;
+      strcpy (xtisa_error_msg, "invalid opcode name");
+      return XTENSA_UNDEFINED;
+    }
 
   entry.key = opname;
   result = bsearch (&entry, intisa->opname_lookup_table, intisa->num_opcodes,
-		    sizeof (opname_lookup_entry), opname_lookup_compare);
-  if (!result) return XTENSA_UNDEFINED;
-  return result->opcode;
+		    sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_opcode;
+      sprintf (xtisa_error_msg, "opcode \"%s\" not recognized", opname);
+      return XTENSA_UNDEFINED;
+    }
+
+  return result->u.opcode;
 }
 
 
 xtensa_opcode
-xtensa_decode_insn (xtensa_isa isa, const xtensa_insnbuf insn)
+xtensa_opcode_decode (xtensa_isa isa, xtensa_format fmt, int slot,
+		      const xtensa_insnbuf slotbuf)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  int n, opc;
-  for (n = 0; n < intisa->num_modules; n++) {
-    opc = (intisa->module_decode_fn[n]) (insn);
-    if (opc != XTENSA_UNDEFINED)
-      return intisa->module_opcode_base[n] + opc;
-  }
-  return XTENSA_UNDEFINED;
-}
+  int slot_id;
+  xtensa_opcode opc;
 
+  CHECK_FORMAT (intisa, fmt, XTENSA_UNDEFINED);
+  CHECK_SLOT (intisa, fmt, slot, XTENSA_UNDEFINED);
 
-/* Opcode information.  */
+  slot_id = intisa->formats[fmt].slot_id[slot];
 
-void
-xtensa_encode_insn (xtensa_isa isa, xtensa_opcode opc, xtensa_insnbuf insn)
+  opc = (intisa->slots[slot_id].opcode_decode_fn) (slotbuf);
+  if (opc == XTENSA_UNDEFINED)
+    {
+      xtisa_errno = xtensa_isa_bad_opcode;
+      strcpy (xtisa_error_msg, "cannot decode opcode");
+    }
+  return opc;
+}
+
+
+int
+xtensa_opcode_encode (xtensa_isa isa, xtensa_format fmt, int slot,
+		      xtensa_insnbuf slotbuf, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  xtensa_insnbuf template = intisa->opcode_table[opc]->template();
-  int len = intisa->opcode_table[opc]->length;
-  int n;
+  int slot_id;
+  xtensa_opcode_encode_fn encode_fn;
 
-  /* Convert length to 32-bit words.  */
-  len = (len + 3) / 4;
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+  CHECK_OPCODE (intisa, opc, -1);
 
-  /* Copy the template.  */
-  for (n = 0; n < len; n++)
-    insn[n] = template[n];
-
-  /* Fill any unused buffer space with zeros.  */
-  for ( ; n < intisa->insnbuf_size; n++)
-    insn[n] = 0;
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  encode_fn = intisa->opcodes[opc].encode_fns[slot_id];
+  if (!encode_fn)
+    {
+      xtisa_errno = xtensa_isa_wrong_slot;
+      sprintf (xtisa_error_msg,
+	       "opcode \"%s\" is not allowed in slot %d of format \"%s\"",
+	       intisa->opcodes[opc].name, slot, intisa->formats[fmt].name);
+      return -1;
+    }
+  (*encode_fn) (slotbuf);
+  return 0;
 }
 
 
@@ -360,234 +727,1015 @@ const char *
 xtensa_opcode_name (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  return intisa->opcode_table[opc]->name;
+  CHECK_OPCODE (intisa, opc, NULL);
+  return intisa->opcodes[opc].name;
+}
+
+
+int
+xtensa_opcode_is_branch (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_BRANCH) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_opcode_is_jump (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_JUMP) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_opcode_is_loop (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_LOOP) != 0)
+    return 1;
+  return 0;
 }
 
 
 int
-xtensa_insn_length (xtensa_isa isa, xtensa_opcode opc)
+xtensa_opcode_is_call (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  return intisa->opcode_table[opc]->length;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  if ((intisa->opcodes[opc].flags & XTENSA_OPCODE_IS_CALL) != 0)
+    return 1;
+  return 0;
 }
 
 
 int
-xtensa_insn_length_from_first_byte (xtensa_isa isa, char first_byte)
+xtensa_opcode_num_operands (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  int is_density = (first_byte & (intisa->is_big_endian ? 0x80 : 0x08)) != 0;
-  return (intisa->has_density && is_density ? 2 : 3);
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  return intisa->iclasses[iclass_id].num_operands;
 }
 
 
 int
-xtensa_num_operands (xtensa_isa isa, xtensa_opcode opc)
+xtensa_opcode_num_stateOperands (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  return intisa->opcode_table[opc]->iclass->num_operands;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  return intisa->iclasses[iclass_id].num_stateOperands;
 }
 
 
-xtensa_operand
-xtensa_get_operand (xtensa_isa isa, xtensa_opcode opc, int opnd)
+int
+xtensa_opcode_num_interfaceOperands (xtensa_isa isa, xtensa_opcode opc)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  xtensa_iclass_internal *iclass = intisa->opcode_table[opc]->iclass;
-  if (opnd >= iclass->num_operands)
-    return NULL;
-  return (xtensa_operand) iclass->operands[opnd];
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  return intisa->iclasses[iclass_id].num_interfaceOperands;
 }
 
 
+int
+xtensa_opcode_num_funcUnit_uses (xtensa_isa isa, xtensa_opcode opc)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  return intisa->opcodes[opc].num_funcUnit_uses;
+}
+
+
+xtensa_funcUnit_use *
+xtensa_opcode_funcUnit_use (xtensa_isa isa, xtensa_opcode opc, int u)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_OPCODE (intisa, opc, NULL);
+  if (u < 0 || u >= intisa->opcodes[opc].num_funcUnit_uses)
+    {
+      xtisa_errno = xtensa_isa_bad_funcUnit;
+      sprintf (xtisa_error_msg, "invalid functional unit use number (%d); "
+	       "opcode \"%s\" has %d", u, intisa->opcodes[opc].name,
+	       intisa->opcodes[opc].num_funcUnit_uses);
+      return NULL;
+    }
+  return &intisa->opcodes[opc].funcUnit_uses[u];
+}
+
+
+
 /* Operand information.  */
 
-char *
-xtensa_operand_kind (xtensa_operand opnd)
+
+#define CHECK_OPERAND(INTISA,OPC,ICLASS,OPND,ERRVAL) \
+  do { \
+    if ((OPND) < 0 || (OPND) >= (ICLASS)->num_operands) \
+      { \
+	xtisa_errno = xtensa_isa_bad_operand; \
+	sprintf (xtisa_error_msg, "invalid operand number (%d); " \
+		 "opcode \"%s\" has %d operands", (OPND), \
+		 (INTISA)->opcodes[(OPC)].name, (ICLASS)->num_operands); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+static xtensa_operand_internal *
+get_operand (xtensa_isa_internal *intisa, xtensa_opcode opc, int opnd)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  return intop->operand_kind;
+  xtensa_iclass_internal *iclass;
+  int iclass_id, operand_id;
+
+  CHECK_OPCODE (intisa, opc, NULL);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_OPERAND (intisa, opc, iclass, opnd, NULL);
+  operand_id = iclass->operands[opnd].u.operand_id;
+  return &intisa->operands[operand_id];
+}
+
+
+const char *
+xtensa_operand_name (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return NULL;
+  return intop->name;
+}
+
+
+int
+xtensa_operand_is_visible (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id, operand_id;
+  xtensa_operand_internal *intop;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_OPERAND (intisa, opc, iclass, opnd, XTENSA_UNDEFINED);
+
+  /* Special case for "sout" operands.  */
+  if (iclass->operands[opnd].inout == 's')
+    return 0;
+
+  operand_id = iclass->operands[opnd].u.operand_id;
+  intop = &intisa->operands[operand_id];
+
+  if ((intop->flags & XTENSA_OPERAND_IS_INVISIBLE) == 0)
+    return 1;
+  return 0;
 }
 
 
 char
-xtensa_operand_inout (xtensa_operand opnd)
+xtensa_operand_inout (xtensa_isa isa, xtensa_opcode opc, int opnd)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  return intop->inout;
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id;
+  char inout;
+
+  CHECK_OPCODE (intisa, opc, 0);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_OPERAND (intisa, opc, iclass, opnd, 0);
+  inout = iclass->operands[opnd].inout;
+
+  /* Special case for "sout" operands.  */
+  if (inout == 's')
+    return 'o';
+
+  return inout;
 }
 
 
-uint32
-xtensa_operand_get_field (xtensa_operand opnd, const xtensa_insnbuf insn)
+int
+xtensa_operand_get_field (xtensa_isa isa, xtensa_opcode opc, int opnd,
+			  xtensa_format fmt, int slot,
+			  const xtensa_insnbuf slotbuf, uint32 *valp)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  return (*intop->get_field) (insn);
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+  int slot_id;
+  xtensa_get_field_fn get_fn;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  if (intop->field_id == XTENSA_UNDEFINED)
+    {
+      xtisa_errno = xtensa_isa_no_field;
+      strcpy (xtisa_error_msg, "implicit operand has no field");
+      return -1;
+    }
+  get_fn = intisa->slots[slot_id].get_field_fns[intop->field_id];
+  if (!get_fn)
+    {
+      xtisa_errno = xtensa_isa_wrong_slot;
+      sprintf (xtisa_error_msg,
+	       "operand \"%s\" does not exist in slot %d of format \"%s\"",
+	       intop->name, slot, intisa->formats[fmt].name);
+      return -1;
+    }
+  *valp = (*get_fn) (slotbuf);
+  return 0;
 }
 
 
-void
-xtensa_operand_set_field (xtensa_operand opnd, xtensa_insnbuf insn, uint32 val)
+int
+xtensa_operand_set_field (xtensa_isa isa, xtensa_opcode opc, int opnd,
+			  xtensa_format fmt, int slot,
+			  xtensa_insnbuf slotbuf, uint32 val)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  return (*intop->set_field) (insn, val);
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+  int slot_id;
+  xtensa_set_field_fn set_fn;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  CHECK_FORMAT (intisa, fmt, -1);
+  CHECK_SLOT (intisa, fmt, slot, -1);
+
+  slot_id = intisa->formats[fmt].slot_id[slot];
+  if (intop->field_id == XTENSA_UNDEFINED)
+    {
+      xtisa_errno = xtensa_isa_no_field;
+      strcpy (xtisa_error_msg, "implicit operand has no field");
+      return -1;
+    }
+  set_fn = intisa->slots[slot_id].set_field_fns[intop->field_id];
+  if (!set_fn)
+    {
+      xtisa_errno = xtensa_isa_wrong_slot;
+      sprintf (xtisa_error_msg,
+	       "operand \"%s\" does not exist in slot %d of format \"%s\"",
+	       intop->name, slot, intisa->formats[fmt].name);
+      return -1;
+    }
+  (*set_fn) (slotbuf, val);
+  return 0;
 }
 
 
-xtensa_encode_result
-xtensa_operand_encode (xtensa_operand opnd, uint32 *valp)
+int
+xtensa_operand_encode (xtensa_isa isa, xtensa_opcode opc, int opnd,
+		       uint32 *valp)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  return (*intop->encode) (valp);
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+  uint32 test_val, orig_val;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  if (!intop->encode)
+    {
+      /* This is a default operand for a field.  How can we tell if the
+	 value fits in the field?  Write the value into the field,
+	 read it back, and then make sure we get the same value.  */
+
+      xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+      static xtensa_insnbuf tmpbuf = 0;
+      int slot_id;
+
+      if (!tmpbuf)
+	{
+	  tmpbuf = xtensa_insnbuf_alloc (isa);
+	  CHECK_ALLOC (tmpbuf, -1);
+	}
+
+      /* A default operand is always associated with a field,
+	 but check just to be sure....  */
+      if (intop->field_id == XTENSA_UNDEFINED)
+	{
+	  xtisa_errno = xtensa_isa_internal_error;
+	  strcpy (xtisa_error_msg, "operand has no field");
+	  return -1;
+	}
+
+      /* Find some slot that includes the field.  */
+      for (slot_id = 0; slot_id < intisa->num_slots; slot_id++)
+	{
+	  xtensa_get_field_fn get_fn =
+	    intisa->slots[slot_id].get_field_fns[intop->field_id];
+	  xtensa_set_field_fn set_fn =
+	    intisa->slots[slot_id].set_field_fns[intop->field_id];
+
+	  if (get_fn && set_fn)
+	    {
+	      (*set_fn) (tmpbuf, *valp);
+	      return ((*get_fn) (tmpbuf) != *valp);
+	    }
+	}
+
+      /* Couldn't find any slot containing the field....  */
+      xtisa_errno = xtensa_isa_no_field;
+      strcpy (xtisa_error_msg, "field does not exist in any slot");
+      return -1;
+    }
+
+  /* Encode the value.  In some cases, the encoding function may detect
+     errors, but most of the time the only way to determine if the value
+     was successfully encoded is to decode it and check if it matches
+     the original value.  */
+  orig_val = *valp;
+  if ((*intop->encode) (valp) ||
+      (test_val = *valp, (*intop->decode) (&test_val)) ||
+      test_val != orig_val)
+    {
+      xtisa_errno = xtensa_isa_bad_value;
+      sprintf (xtisa_error_msg, "cannot encode operand value 0x%08x", *valp);
+      return -1;
+    }
+
+  return 0;
 }
 
 
-uint32
-xtensa_operand_decode (xtensa_operand opnd, uint32 val)
+int
+xtensa_operand_decode (xtensa_isa isa, xtensa_opcode opc, int opnd,
+		       uint32 *valp)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  return (*intop->decode) (val);
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  /* Use identity function for "default" operands.  */
+  if (!intop->decode)
+    return 0;
+
+  if ((*intop->decode) (valp))
+    {
+      xtisa_errno = xtensa_isa_bad_value;
+      sprintf (xtisa_error_msg, "cannot decode operand value 0x%08x", *valp);
+      return -1;
+    }
+  return 0;
 }
 
 
 int
-xtensa_operand_isPCRelative (xtensa_operand opnd)
+xtensa_operand_is_register (xtensa_isa isa, xtensa_opcode opc, int opnd)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  return intop->isPCRelative;
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_REGISTER) != 0)
+    return 1;
+  return 0;
 }
 
 
-uint32
-xtensa_operand_do_reloc (xtensa_operand opnd, uint32 addr, uint32 pc)
+xtensa_regfile
+xtensa_operand_regfile (xtensa_isa isa, xtensa_opcode opc, int opnd)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  if (!intop->isPCRelative)
-    return addr;
-  return (*intop->do_reloc) (addr, pc);
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  return intop->regfile;
 }
 
 
-uint32
-xtensa_operand_undo_reloc (xtensa_operand opnd, uint32 offset, uint32 pc)
+int
+xtensa_operand_num_regs (xtensa_isa isa, xtensa_opcode opc, int opnd)
 {
-  xtensa_operand_internal *intop = (xtensa_operand_internal *) opnd;
-  if (!intop->isPCRelative)
-    return offset;
-  return (*intop->undo_reloc) (offset, pc);
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  return intop->num_regs;
 }
 
 
-/* Instruction buffers.  */
+int
+xtensa_operand_is_known_reg (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
 
-xtensa_insnbuf
-xtensa_insnbuf_alloc (xtensa_isa isa)
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_UNKNOWN) == 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_operand_is_PCrelative (xtensa_isa isa, xtensa_opcode opc, int opnd)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return XTENSA_UNDEFINED;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) != 0)
+    return 1;
+  return 0;
+}
+
+
+int
+xtensa_operand_do_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd,
+			 uint32 *valp, uint32 pc)
 {
-  return (xtensa_insnbuf) malloc (xtensa_insnbuf_size (isa) *
-				  sizeof (xtensa_insnbuf_word));
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) == 0)
+    return 0;
+
+  if (!intop->do_reloc)
+    {
+      xtisa_errno = xtensa_isa_internal_error;
+      strcpy (xtisa_error_msg, "operand missing do_reloc function");
+      return -1;
+    }
+
+  if ((*intop->do_reloc) (valp, pc))
+    {
+      xtisa_errno = xtensa_isa_bad_value;
+      sprintf (xtisa_error_msg,
+	       "do_reloc failed for value 0x%08x at PC 0x%08x", *valp, pc);
+      return -1;
+    }
+
+  return 0;
 }
 
 
-void
-xtensa_insnbuf_free (xtensa_insnbuf buf)
+int
+xtensa_operand_undo_reloc (xtensa_isa isa, xtensa_opcode opc, int opnd,
+			   uint32 *valp, uint32 pc)
 {
-  free( buf );
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_operand_internal *intop;
+
+  intop = get_operand (intisa, opc, opnd);
+  if (!intop) return -1;
+
+  if ((intop->flags & XTENSA_OPERAND_IS_PCRELATIVE) == 0)
+    return 0;
+
+  if (!intop->undo_reloc)
+    {
+      xtisa_errno = xtensa_isa_internal_error;
+      strcpy (xtisa_error_msg, "operand missing undo_reloc function");
+      return -1;
+    }
+
+  if ((*intop->undo_reloc) (valp, pc))
+    {
+      xtisa_errno = xtensa_isa_bad_value;
+      sprintf (xtisa_error_msg,
+	       "undo_reloc failed for value 0x%08x at PC 0x%08x", *valp, pc);
+      return -1;
+    }
+
+  return 0;
 }
 
 
-/* Given <byte_index>, the index of a byte in a xtensa_insnbuf, our
-   internal representation of a xtensa instruction word, return the index of
-   its word and the bit index of its low order byte in the xtensa_insnbuf.  */
+
+/* State Operands.  */
 
-static inline int
-byte_to_word_index (int byte_index)
+
+#define CHECK_STATE_OPERAND(INTISA,OPC,ICLASS,STOP,ERRVAL) \
+  do { \
+    if ((STOP) < 0 || (STOP) >= (ICLASS)->num_stateOperands) \
+      { \
+	xtisa_errno = xtensa_isa_bad_operand; \
+	sprintf (xtisa_error_msg, "invalid state operand number (%d); " \
+		 "opcode \"%s\" has %d state operands", (STOP), \
+		 (INTISA)->opcodes[(OPC)].name, (ICLASS)->num_stateOperands); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_state
+xtensa_stateOperand_state (xtensa_isa isa, xtensa_opcode opc, int stOp)
 {
-  return byte_index / sizeof (xtensa_insnbuf_word);
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_STATE_OPERAND (intisa, opc, iclass, stOp, XTENSA_UNDEFINED);
+  return iclass->stateOperands[stOp].u.state;
 }
 
 
-static inline int
-byte_to_bit_index (int byte_index)
+char
+xtensa_stateOperand_inout (xtensa_isa isa, xtensa_opcode opc, int stOp)
 {
-  return (byte_index & 0x3) * 8;
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_iclass_internal *iclass;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, 0);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_STATE_OPERAND (intisa, opc, iclass, stOp, 0);
+  return iclass->stateOperands[stOp].inout;
 }
 
+
+/* Interface Operands.  */
 
-/* Copy an instruction in the 32 bit words pointed at by <insn> to characters
-   pointed at by <cp>.  This is more complicated than you might think because
-   we want 16 bit instructions in bytes 2,3 for big endian. This function
-   allows us to specify which byte in <insn> to start with and which way to
-   increment, allowing trivial implementation for both big and little endian.
-   And it seems to make pretty good code for both.  */
 
-void
-xtensa_insnbuf_to_chars (xtensa_isa isa, const xtensa_insnbuf insn, char *cp)
+#define CHECK_INTERFACE_OPERAND(INTISA,OPC,ICLASS,IFOP,ERRVAL) \
+  do { \
+    if ((IFOP) < 0 || (IFOP) >= (ICLASS)->num_interfaceOperands) \
+      { \
+	xtisa_errno = xtensa_isa_bad_operand; \
+	sprintf (xtisa_error_msg, "invalid interface operand number (%d); " \
+		 "opcode \"%s\" has %d interface operands", (IFOP), \
+		 (INTISA)->opcodes[(OPC)].name, \
+		 (ICLASS)->num_interfaceOperands); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_interface
+xtensa_interfaceOperand_interface (xtensa_isa isa, xtensa_opcode opc,
+				   int ifOp)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  int insn_size = xtensa_insn_maxlength (intisa);
-  int fence_post, start, increment, i, byte_count;
-  xtensa_opcode opc;
+  xtensa_iclass_internal *iclass;
+  int iclass_id;
+
+  CHECK_OPCODE (intisa, opc, XTENSA_UNDEFINED);
+  iclass_id = intisa->opcodes[opc].iclass_id;
+  iclass = &intisa->iclasses[iclass_id];
+  CHECK_INTERFACE_OPERAND (intisa, opc, iclass, ifOp, XTENSA_UNDEFINED);
+  return iclass->interfaceOperands[ifOp];
+}
 
-  if (intisa->is_big_endian)
+
+
+/* Register Files.  */
+
+
+#define CHECK_REGFILE(INTISA,RF,ERRVAL) \
+  do { \
+    if ((RF) < 0 || (RF) >= (INTISA)->num_regfiles) \
+      { \
+	xtisa_errno = xtensa_isa_bad_regfile; \
+	strcpy (xtisa_error_msg, "invalid regfile specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_regfile
+xtensa_regfile_lookup (xtensa_isa isa, const char *name)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int n;
+
+  if (!name || !*name)
     {
-      start = insn_size - 1;
-      increment = -1;
+      xtisa_errno = xtensa_isa_bad_regfile;
+      strcpy (xtisa_error_msg, "invalid regfile name");
+      return XTENSA_UNDEFINED;
     }
-  else
+
+  /* The expected number of regfiles is small; use a linear search.  */
+  for (n = 0; n < intisa->num_regfiles; n++)
     {
-      start = 0;
-      increment = 1;
+      if (!strcmp (intisa->regfiles[n].name, name))
+	return n;
     }
 
-  /* Find the opcode; do nothing if the buffer does not contain a valid
-     instruction since we need to know how many bytes to copy.  */
-  opc = xtensa_decode_insn (isa, insn);
-  if (opc == XTENSA_UNDEFINED)
-    return;
+  xtisa_errno = xtensa_isa_bad_regfile;
+  sprintf (xtisa_error_msg, "regfile \"%s\" not recognized", name);
+  return XTENSA_UNDEFINED;
+}
 
-  byte_count = xtensa_insn_length (isa, opc);
-  fence_post = start + (byte_count * increment);
 
-  for (i = start; i != fence_post; i += increment, ++cp)
+xtensa_regfile
+xtensa_regfile_lookup_shortname (xtensa_isa isa, const char *shortname)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  int n;
+
+  if (!shortname || !*shortname)
     {
-      int word_inx = byte_to_word_index (i);
-      int bit_inx = byte_to_bit_index (i);
+      xtisa_errno = xtensa_isa_bad_regfile;
+      strcpy (xtisa_error_msg, "invalid regfile shortname");
+      return XTENSA_UNDEFINED;
+    }
 
-      *cp = (insn[word_inx] >> bit_inx) & 0xff;
+  /* The expected number of regfiles is small; use a linear search.  */
+  for (n = 0; n < intisa->num_regfiles; n++)
+    {
+      /* Ignore regfile views since they always have the same shortnames
+	 as their parents.  */
+      if (intisa->regfiles[n].parent != n)
+	continue;
+      if (!strcmp (intisa->regfiles[n].shortname, shortname))
+	return n;
     }
+
+  xtisa_errno = xtensa_isa_bad_regfile;
+  sprintf (xtisa_error_msg, "regfile shortname \"%s\" not recognized",
+	   shortname);
+  return XTENSA_UNDEFINED;
 }
 
-/* Inward conversion from byte stream to xtensa_insnbuf.  See
-   xtensa_insnbuf_to_chars for a discussion of why this is
-   complicated by endianness.  */
-    
-void
-xtensa_insnbuf_from_chars (xtensa_isa isa, xtensa_insnbuf insn, const char* cp)
+
+const char *
+xtensa_regfile_name (xtensa_isa isa, xtensa_regfile rf)
 {
   xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
-  int insn_size = xtensa_insn_maxlength (intisa);
-  int fence_post, start, increment, i;
+  CHECK_REGFILE (intisa, rf, NULL);
+  return intisa->regfiles[rf].name;
+}
 
-  if (intisa->is_big_endian)
+
+const char *
+xtensa_regfile_shortname (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, NULL);
+  return intisa->regfiles[rf].shortname;
+}
+
+
+xtensa_regfile
+xtensa_regfile_view_parent (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, XTENSA_UNDEFINED);
+  return intisa->regfiles[rf].parent;
+}
+
+
+int
+xtensa_regfile_num_bits (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, XTENSA_UNDEFINED);
+  return intisa->regfiles[rf].num_bits;
+}
+
+
+int
+xtensa_regfile_num_entries (xtensa_isa isa, xtensa_regfile rf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_REGFILE (intisa, rf, XTENSA_UNDEFINED);
+  return intisa->regfiles[rf].num_entries;
+}
+
+
+/* Processor States.  */
+
+
+#define CHECK_STATE(INTISA,ST,ERRVAL) \
+  do { \
+    if ((ST) < 0 || (ST) >= (INTISA)->num_states) \
+      { \
+	xtisa_errno = xtensa_isa_bad_state; \
+	strcpy (xtisa_error_msg, "invalid state specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_state
+xtensa_state_lookup (xtensa_isa isa, const char *name)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result;
+
+  if (!name || !*name)
     {
-      start = insn_size - 1;
-      increment = -1;
+      xtisa_errno = xtensa_isa_bad_state;
+      strcpy (xtisa_error_msg, "invalid state name");
+      return XTENSA_UNDEFINED;
     }
-  else
+
+  entry.key = name;
+  result = bsearch (&entry, intisa->state_lookup_table, intisa->num_states,
+		    sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  if (!result)
     {
-      start = 0;
-      increment = 1;
+      xtisa_errno = xtensa_isa_bad_state;
+      sprintf (xtisa_error_msg, "state \"%s\" not recognized", name);
+      return XTENSA_UNDEFINED;
     }
 
-  fence_post = start + (insn_size * increment);
-  memset (insn, 0, xtensa_insnbuf_size (isa) * sizeof (xtensa_insnbuf_word));
+  return result->u.state;
+}
 
-  for ( i = start; i != fence_post; i += increment, ++cp )
+
+const char *
+xtensa_state_name (xtensa_isa isa, xtensa_state st)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_STATE (intisa, st, NULL);
+  return intisa->states[st].name;
+}
+
+
+int
+xtensa_state_num_bits (xtensa_isa isa, xtensa_state st)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_STATE (intisa, st, XTENSA_UNDEFINED);
+  return intisa->states[st].num_bits;
+}
+
+
+int
+xtensa_state_is_exported (xtensa_isa isa, xtensa_state st)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_STATE (intisa, st, XTENSA_UNDEFINED);
+  if ((intisa->states[st].flags & XTENSA_STATE_IS_EXPORTED) != 0)
+    return 1;
+  return 0;
+}
+
+
+/* Sysregs.  */
+
+
+#define CHECK_SYSREG(INTISA,SYSREG,ERRVAL) \
+  do { \
+    if ((SYSREG) < 0 || (SYSREG) >= (INTISA)->num_sysregs) \
+      { \
+	xtisa_errno = xtensa_isa_bad_sysreg; \
+	strcpy (xtisa_error_msg, "invalid sysreg specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_sysreg
+xtensa_sysreg_lookup (xtensa_isa isa, int num, int is_user)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+
+  if (is_user != 0)
+    is_user = 1;
+
+  if (num < 0 || num > intisa->max_sysreg_num[is_user]
+      || intisa->sysreg_table[is_user][num] == XTENSA_UNDEFINED)
     {
-      int word_inx = byte_to_word_index (i);
-      int bit_inx = byte_to_bit_index (i);
+      xtisa_errno = xtensa_isa_bad_sysreg;
+      strcpy (xtisa_error_msg, "sysreg not recognized");
+      return XTENSA_UNDEFINED;
+    }
 
-      insn[word_inx] |= (*cp & 0xff) << bit_inx;
+  return intisa->sysreg_table[is_user][num];
+}
+
+
+xtensa_sysreg
+xtensa_sysreg_lookup_name (xtensa_isa isa, const char *name)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result;
+
+  if (!name || !*name)
+    {
+      xtisa_errno = xtensa_isa_bad_sysreg;
+      strcpy (xtisa_error_msg, "invalid sysreg name");
+      return XTENSA_UNDEFINED;
+    }
+
+  entry.key = name;
+  result = bsearch (&entry, intisa->sysreg_lookup_table, intisa->num_sysregs,
+		    sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_sysreg;
+      sprintf (xtisa_error_msg, "sysreg \"%s\" not recognized", name);
+      return XTENSA_UNDEFINED;
     }
+
+  return result->u.sysreg;
+}
+
+
+const char *
+xtensa_sysreg_name (xtensa_isa isa, xtensa_sysreg sysreg)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_SYSREG (intisa, sysreg, NULL);
+  return intisa->sysregs[sysreg].name;
+}
+
+
+int
+xtensa_sysreg_number (xtensa_isa isa, xtensa_sysreg sysreg)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_SYSREG (intisa, sysreg, XTENSA_UNDEFINED);
+  return intisa->sysregs[sysreg].number;
+}
+
+
+int
+xtensa_sysreg_is_user (xtensa_isa isa, xtensa_sysreg sysreg)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_SYSREG (intisa, sysreg, XTENSA_UNDEFINED);
+  if (intisa->sysregs[sysreg].is_user)
+    return 1;
+  return 0;
+}
+
+
+/* Interfaces.  */
+
+
+#define CHECK_INTERFACE(INTISA,INTF,ERRVAL) \
+  do { \
+    if ((INTF) < 0 || (INTF) >= (INTISA)->num_interfaces) \
+      { \
+	xtisa_errno = xtensa_isa_bad_interface; \
+	strcpy (xtisa_error_msg, "invalid interface specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_interface
+xtensa_interface_lookup (xtensa_isa isa, const char *ifname)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result;
+
+  if (!ifname || !*ifname)
+    {
+      xtisa_errno = xtensa_isa_bad_interface;
+      strcpy (xtisa_error_msg, "invalid interface name");
+      return XTENSA_UNDEFINED;
+    }
+
+  entry.key = ifname;
+  result = bsearch (&entry, intisa->interface_lookup_table,
+		    intisa->num_interfaces,
+		    sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_interface;
+      sprintf (xtisa_error_msg, "interface \"%s\" not recognized", ifname);
+      return XTENSA_UNDEFINED;
+    }
+
+  return result->u.intf;
+}
+
+
+const char *
+xtensa_interface_name (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, NULL);
+  return intisa->interfaces[intf].name;
+}
+
+
+int
+xtensa_interface_num_bits (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, XTENSA_UNDEFINED);
+  return intisa->interfaces[intf].num_bits;
+}
+
+
+char
+xtensa_interface_inout (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, 0);
+  return intisa->interfaces[intf].inout;
+}
+
+
+int
+xtensa_interface_has_side_effect (xtensa_isa isa, xtensa_interface intf)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_INTERFACE (intisa, intf, XTENSA_UNDEFINED);
+  if ((intisa->interfaces[intf].flags & XTENSA_INTERFACE_HAS_SIDE_EFFECT) != 0)
+    return 1;
+  return 0;
+}
+
+
+/* Functional Units.  */
+
+
+#define CHECK_FUNCUNIT(INTISA,FUN,ERRVAL) \
+  do { \
+    if ((FUN) < 0 || (FUN) >= (INTISA)->num_funcUnits) \
+      { \
+	xtisa_errno = xtensa_isa_bad_funcUnit; \
+	strcpy (xtisa_error_msg, "invalid functional unit specifier"); \
+	return (ERRVAL); \
+      } \
+  } while (0)
+
+
+xtensa_funcUnit
+xtensa_funcUnit_lookup (xtensa_isa isa, const char *fname)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  xtensa_lookup_entry entry, *result;
+
+  if (!fname || !*fname)
+    {
+      xtisa_errno = xtensa_isa_bad_funcUnit;
+      strcpy (xtisa_error_msg, "invalid functional unit name");
+      return XTENSA_UNDEFINED;
+    }
+
+  entry.key = fname;
+  result = bsearch (&entry, intisa->funcUnit_lookup_table,
+		    intisa->num_funcUnits,
+		    sizeof (xtensa_lookup_entry), xtensa_isa_name_compare);
+
+  if (!result)
+    {
+      xtisa_errno = xtensa_isa_bad_funcUnit;
+      sprintf (xtisa_error_msg,
+	       "functional unit \"%s\" not recognized", fname);
+      return XTENSA_UNDEFINED;
+    }
+
+  return result->u.fun;
+}
+
+
+const char *
+xtensa_funcUnit_name (xtensa_isa isa, xtensa_funcUnit fun)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FUNCUNIT (intisa, fun, NULL);
+  return intisa->funcUnits[fun].name;
+}
+
+
+int
+xtensa_funcUnit_num_copies (xtensa_isa isa, xtensa_funcUnit fun)
+{
+  xtensa_isa_internal *intisa = (xtensa_isa_internal *) isa;
+  CHECK_FUNCUNIT (intisa, fun, XTENSA_UNDEFINED);
+  return intisa->funcUnits[fun].num_copies;
 }