* src/vm/jit/stack.c (new_stack_analyse): Combined calls to
stack_create_instack.

--HG--
branch : unified_variables

* src/vm/jit/jit.h (basicblock): Removed members instack and
outstack.

* src/vm/jit/stack.c (stack_check_invars): New function.
(stack_create_instack): New function.
(stack_mark_reached): Use new functions.
(new_stack_analyse): Likewise.

* src/vm/jit/stack.h (COPYCURSTACK): Removed macro.

--HG--
branch : unified_variables

* src/vm/jit/stack.h (COPYCURSTACK): Do not create invars here.

* src/vm/jit/stack.c (stack_create_invars): New function.
(stack_mark_reached): Use stack_create_invars.
(new_stack_analyse): Likewise.

--HG--
branch : unified_variables

* src/vm/jit/jit.h (basicblock): Added fields varstart and varcount.
Reordered fields for clarity and alignment.

* src/vm/jit/stack.c (new_stack_analyse): Set varstart and varcount
of each basic block.

--HG--
branch : unified_variables

* src/vm/exceptions.c (exceptions_handle_exception): Added comment on
why we have to do eager resolving here. Check for exceptions while
resolving the catch class reference.

* src/vm/linker.c (link_class_intern): Resolve exception classes
in handler entries lazily, instead of eagerly.

--HG--
branch : unified_variables

* src/vm/jit/stack.h (CURKIND): Removed macro.
(CURTYPE): Removed macro.

* src/vm/jit/stack.c (new_stack_analyse): Removed the single use of
CURKIND.

--HG--
branch : unified_variables

* src/vm/jit/stack.h (Changes): Added my name.

--HG--
branch : unified_variables

* src/vm/jit/stack.h (REQUIRE_1, REQUIRE_2, REQUIRE_3, REQUIRE_4):
Removed.
* src/vm/jit/stack.c (new_stack_analyse): Use the general REQUIRE
macro.

--HG--
branch : unified_variables

* src/vm/jit/stack.c (IS_TEMPVAR): Fix bug spotted
(and produced ;) by c_u.

--HG--
branch : unified_variables

* src/vm/jit/stack.c (new_stack_analyse): Added some assertion.
When we do a STORE coalescing, the stackslot must have a creator.

--HG--
branch : unified_variables

* src/vm/jit/stack.c (new_stack_analyse): Unified last_dup_boundary
and last_pei_boundary to coalescing_boundary.
Activated STORE coalescing. Change destination operand of creator, if any.

--HG--
branch : unified_variables

* src/vm/jit/stack.h (COPYCURSTACK): Use GET_NEW_VAR.
Removed SET_OUTVAR.
* src/vm/jit/stack.c (GET_NEW_VAR): New macro.
(various macros): Use GET_NEW_VAR, so the variable type is set.
Reset coalescing for non-consuming uses.
(SET_TEMPVAR): Fix: do not use "copy". Change the destination operand
of the creator, if any.
(DST_LOCAL): Activate LOAD coalescing.
(new_stack_analyse): Reset coalescing for pass-through operands.

--HG--
branch : unified_variables

* src/vm/jit/jit.h (stackelement): Added creator field.
* src/vm/jit/stack.h (COPYCURSTACK): Set creator = NULL.
* src/vm/jit/stack.c (DST, DST_LOCALVAR, MOVE_COPY_UP, COPY_DOWN):
Set creator to current iptr.
* src/vm/jit/stack.h: Cleaned up macros.
* src/vm/jit/stack.c: Likewise.

--HG--
branch : unified_variables

* src/vm/jit/codegen-common.h: Removed the NEW_VAR define.
* src/vm/jit/stack.c: Likewise.
* src/vm/jit/verify/typecheck.c: Likewise.
* src/vm/jit/i386/codegen.c: Likewise.
* src/vm/jit/parse.c: Likewise.
* src/vm/jit/reg.c: Likewise.
* src/vm/jit/reg.h: Likewise.
* src/vm/jit/jit.c: Likewise.
* src/vm/jit/codegen-common.c: Likewise.
* src/vm/jit/jit.h: Likewise, and removed the dupslots member from
the dst_operand_t union.

--HG--
branch : unified_variables

* src/vm/jit/show.c (new_show_icmd): Removed code for DUPs.

--HG--
branch : unified_variables

* src/vm/jit/verify/typecheck.c: Removed code for DUPs.

--HG--
branch : unified_variables

* src/vm/jit/i386/codegen.c (codegen): Removed code for DUPs.

--HG--
branch : unified_variables

* src/vm/jit/i386/codegen.c (*LOAD, *STORE): Normalized the source ==
dest check so it always looks the same.
(LLOAD, LSTORE): Use M_LNGMOVE, not M_INTMOVE.
(DSTORE): Combined with FSTORE, because it now has the same code.

--HG--
branch : unified_variables

* src/vm/jit/i386/codegen.c (codegen): Fix LSTORE: The source == dest
test was broken.

--HG--
branch : unified_variables

* src/vm/jit/show.c (new_show_method): Fix display of local table.

--HG--
branch : unified_variables

* src/vm/jit/stack.c (new_stack_analyse): Fix ICMD_RET: The variable
index has to be mapped.

--HG--
branch : unified_variables

* src/vm/jit/stack.c (DUP_SLOT): Turn off coalescing.
(MOVE_COPY_UP): New macro.
(COPY_DOWN): New macro.
(interface_map): Changed to array of interface_info.
(*STORE): Fix index into last_store_boundary (must be javaindex).
(DUP*, SWAP): Eliminate DUPs.
(new_stack_analyse): Mark invar interfaces used.

* src/vm/jit/show.c (new_show_method): Adapted to new
interface_map layout.

* src/vm/jit/allocator/simplereg.c (interface_regalloc): Adapted
to new interface_map layout.
(new_allocate_scratch_registers): Likewise.
(new_allocate_scratch_registers): Removed code for DUP* instructions.
(ICMD_MOVE, ICMD_COPY): Added.

--HG--
branch : unified_variables

* src/vm/jit/i386/codegen.h (M_FLTMOVE): Only assert(0) if move would
have to be performed.

--HG--
branch : unified_variables

* src/vm/jit/show.c (show_variable): Check for invalid flags.

--HG--
branch : unified_variables

* src/vm/jit/i386/codegen.c (codegen): Removed a debug print.

--HG--
branch : unified_variables

* src/vm/jit/stack.c (DST_LOCALVAR): _Really_ turn off coalescing
temporarily.

--HG--
branch : unified_variables

* src/vm/jit/allocator/simplereg.c (interface_regalloc): Changed
allocation of interface registers. interface_map now contains the
necessary flags, and receives a combination of allocated flags
and regoff.

(new_allocate_scratch_registers): Copy the allocation of the
invars and outvars for each basic block.

--HG--
branch : unified_variables

* src/vm/jit/jit.h (LOCAL_UNUSED): Changed (in comment) to UNUSED.

--HG--
branch : unified_variables

* src/vm/jit/stack.c (stackdata_t): New struct for keeping internal
data of the stack analysis. This is necessary for converting macros
to functions.
(various macros): Adapted to use stackdata_t. Removed old code.
(DST_LOCALVAR): Temporarily turned off local variable coalescing.
(MARKREACHED): Converted to a function.
(stack_mark_reached): New function.
(last_store_boundary): Use java indices instead of internal local
indices into this table.
(new_stack_analyse): Removed old code.

* src/vm/jit/stack.h (various macros): Adapted to use stackdata_t.
(MARKREACHED): Converted to a function.

--HG--
branch : unified_variables

* src/vm/jit/parse.h: Removed old code.
* src/vm/jit/parse.c (new_parse): Do not modify m->maxlocals and cd->maxlocals.
They refer to the number of javalocals, and that's ok. We have jd->localcount
to keep the number of internal locals.

--HG--
branch : unified_variables

* src/vm/jit/show.c (new_show_method): Show isleafmethod.
(new_show_method): Pretty interface map printing (prepared for
interface register allocation changes).
(new_show_method): Print allocation of stack slots.
(show_allocation): New function.
(show_variable): Mark SAVEDVARs with an exclamation mark.

--HG--
branch : unified_variables

* src/vm/jit/show.c (new_show_method): Only show local table if there
are locals.

--HG--
branch : unified_variables

* src/vm/jit/show.c (jit_type): Made types uppercase.
(new_show_method): Prettier printing of locals_map and interface_map.
(SHOW_STACKVAR): Renamed to SHOW_VARIABLE.
(new_show_stackvar): Renamed to show_variable. Cleaned up.

--HG--
branch : unified_variables

* src/vm/jit/allocator/simplereg.c (reg_new_temp_func): Removed old
version.
(reg_free_temp_func): Likewise.
(allocate_scratch_registers): Likewise.

--HG--
branch : unified_variables

* src/vm/jit/allocator/simplereg.c (reg_alloc_dup): Removed.
(new_reg_mark_copy): Likewise.

--HG--
branch : unified_variables

* src/vm/jit/i386/codegen.c (ICMD_COPY): Added.
(ICMD_MOVE): Likewise.

--HG--
branch : unified_variables

* src/vm/jit/reg.h (varinfo): New field copycount.
* src/vm/jit/parse.c (new_parse): Zero jd->var array.

--HG--
branch : unified_variables

* src/vm/jit/parse.c (new_parse): Allocate extra NOPs for stack
operations.

--HG--
branch : unified_variables

* src/vm/jit/show.c (ICMD_COPY): Uncommented.
(ICMD_MOVE): Likewise.

--HG--
branch : unified_variables

* src/vm/jit/jit.h, src/vm/jit/jit.c (ICMD_COPY): New ICMD.
(ICMD_MOVE): Likewise.

--HG--
branch : unified_variables

* src/vm/jit/allocator/simplreg: Removed #if defined(NEW_VAR) over some functions.

--HG--
branch : unified_variables

* src/vm/jit/jit.c (ENABLE_VERIFY): Corrected to ENABLE_VERIFIER.

--HG--
branch : unified_variables

Unified variables changes for common/i386.

--HG--
branch : unified_variables

* src/vm/jit/i386/emit.c: Use IS_INMEMORY macro.
* src/vm/jit/i386/codegen.c: Likewise.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc/codegen.c (codegen): Use IS_INMEMORY macro.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc/emit.c (emit_copy): Eliminate register move if
one of the variables resides in memory.

--HG--
branch : new_instruction_format

* src/vm/jit/alpha/emit.c (emit_copy): Only one not-equal comparison.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc64/emit.c (emit_copy): Eliminate register move if
one of the variables resides in memory.

--HG--
branch : new_instruction_format

* src/vm/jit/mips/emit.c (emit_copy): Eliminate register move if one
of the variables resides in memory.

--HG--
branch : new_instruction_format

* src/vm/jit/i386/emit.c (emit_copy): Eliminate register move if one
of the variables resides in memory.

--HG--
branch : new_instruction_format

* src/vm/jit/x86_64/emit.c (emit_copy): Eliminate register move if one
of the variables resides in memory.

--HG--
branch : new_instruction_format

* src/vm/jit/alpha/emit.c (emit_copy): Eliminate register move if one
of the variables resides in memory.

--HG--
branch : new_instruction_format

* src/vm/jit/jit.h (IS_SAVEDVAR): Added.
(IS_INMEMORY): Likewise.

--HG--
branch : new_instruction_format

* src/vm/jit/show.c (new_show_icmd): Separate real arguments and
pass-through variables for INVOKE*.

--HG--
branch : new_instruction_format

* src/vm/jit/show.c (new_show_icmd): Separate real arguments and
pass-through variables for BUILTIN.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc64/linux/md-abi.h: Bugfixes and changes for new
instruction format.
* src/vm/jit/powerpc64/linux/md-abi.c: Likewise.
* src/vm/jit/powerpc64/emit.c: Likewise.
* src/vm/jit/powerpc64/codegen.c: Likewise.
* src/vm/jit/powerpc64/codegen.h: Likewise.

--HG--
branch : new_instruction_format

* src/vm/jit/mips/linux/md-abi.h (REG_A0, REG_A1, REG_A2, REG_A3):
Defined.
* src/vm/jit/mips/codegen.c: Use REG_A? defines instead of
rd->argintreg[] loads.

--HG--
branch : new_instruction_format

* src/vm/jit/alpha/linux/md-abi.h (REG_A0, REG_A1, REG_A2, REG_A3):
Defined.
* src/vm/jit/alpha/codegen.c: Use REG_A? defines instead of
rd->argintreg[] loads.

--HG--
branch : new_instruction_format

* src/vm/jit/x86_64/md-abi.h (REG_A0, REG_A1, REG_A2, REG_A3):
Defined.
* src/vm/jit/x86_64/codegen.c: Use REG_A? defines instead of
rd->argintreg[] loads.

--HG--
branch : new_instruction_format

* src/vm/jit/stack.c (new_stack_analyse): Removed obsolete precedessor
calucation.

--HG--
branch : new_instruction_format

* tests/regression/jasmin/test_dup_x2.j: Split second test into
separate file.
* tests/regression/jasmin/test_dup_x2_to_dup_x1: New test.

--HG--
branch : new_instruction_format

* tests/regression/jasmin/runtest: Improved harness script.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc/linux/md-abi.h (REG_A0, REG_A1, REG_A2, REG_A3):
Defined.
* src/vm/jit/powerpc/darwin/md-abi.h: Likewise.

* src/vm/jit/powerpc/codegen.c: Use REG_A? defines instead of
rd->argintreg[] loads.

--HG--
branch : new_instruction_format

* src/vm/jit/mips/codegen.c (codegen): Generate the INVOKE/BUILTIN
call code in a common place.

--HG--
branch : new_instruction_format

* src/vm/jit/x86_64/codegen.c (codegen): Generate the INVOKE/BUILTIN
call code in a common place.

--HG--
branch : new_instruction_format

* src/vm/jit/i386/codegen.c (codegen): Don't move the function address
into disp for ICMD_BUILTIN.

--HG--
branch : new_instruction_format

* src/vm/jit/i386/codegen.c (codegen): Generate the INVOKE/BUILTIN
call code in a common place.
(createnativestub): Removed unused disp variable.

--HG--
branch : new_instruction_format

* src/vm/jit/alpha/codegen.c (codegen): Generate the INVOKE/BUILTIN
call code in a common place.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc/codegen.c (codegen): Generate the INVOKE/BUILTIN
call code in a common place.

--HG--
branch : new_instruction_format

* src/vm/jit/jit.h (INS_FLAG_NOCHECK): Reversed to INS_FLAG_CHECK.
* src/vm/jit/stack.c:  Likewise.
* src/vm/jit/stack.h: Likewise.
* src/vm/jit/parse.c: Likewise.
* src/vm/jit/parse.h: Likewise.

--HG--
branch : new_instruction_format

* src/vm/jit/parse.h (INSTRUCTIONS_CHECK): New macro.
* src/vm/jit/parse.c (new_parse): Merged twisti's reallocation of the
instruction array.

--HG--
branch : new_instruction_format

* src/vm/jit/alpha/codegen.c (ICMD_I2L): Use REG_ITMP1 for dst, this
can save a move.
(ICMD_LDIV, ICMD_LREM): Use argument registers for s1 and s2 when
loaded.

--HG--
branch : new_instruction_format

Checked in jasmin tests.

--HG--
branch : new_instruction_format

* src/vm/jit/parse.c (parserdata_t): New type.
(parse_setup): New function.
(parse_check_instructions): New function.

--HG--
branch : new_instruction_format

* src/vm/jit/stack.c (new_stack_analyse): Ifdeffed handling of new var
system.

* src/vm/jit/stack.h: Likewise.

* src/vm/jit/parse.c (new_parse) : Likewise.

* src/vm/jit/parse.h: Likewise.

* src/vm/jit/jit.h: Ifdeffed structure entries for new var system.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc/codegen.c (codegen): Use M_ISUB in ICMD_ISUBCONST
instead of M_IADD.

--HG--
branch : new_instruction_format

* src/vm/jit/mips/emit.c (emit_copy): Removed accidentally pasted
code.

--HG--
branch : new_instruction_format

* src/vm/jit/stack.h: Removed macros for old instruction format.

--HG--
branch : new_instruction_format

* src/vm/jit/parse.h: Removed NEW_ prefix from macros.
* src/vm/jit/parse.c: Likewise.

--HG--
branch : new_instruction_format

* src/vm/jit/stack.h (CHECKOVERFLOW): Removed.
(NEW_CHECKOVERFLOW): Renamed to CHECKOVERFLOW.

* src/vm/jit/stack.c (new_stack_analyse): Removed NEW_ prefix from
macro names.

--HG--
branch : new_instruction_format

* src/vm/jit/x86_64/emit.c: Renamed new_instruction to instruction.
* src/vm/jit/x86_64/md-emit.h: Likewise.
* src/vm/jit/x86_64/codegen.c: Likewise.

--HG--
branch : new_instruction_format

* src/vm/stack.c (new_stack_analyse): Removed assert to check, that
all outvars are STACKVARS. Would be a possible conflict with swap

* src/vm/parse.c (new_parse): Data colletion for local var
renaming(de-coalescing)

* src/vm/parse.h (new_pase): Likewise.

* src/vm/jit.h: Likewise.

* src/vm/jit/i386/codegen.c (codegen): Ifdefed interface copy in regard to new
var system.

--HG--
branch : new_instruction_format

* src/vm/jit/mips/emit.c (emit_load_s1): Removed obsolete src param.
(emit_load_s2): Likewise.
(emit_load_s3): Likewise.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc64/emit.c (emit_load): New function.
(emit_load_s1): Implemented in terms of emit_load.
(emit_load_s2): Likewise.
(emit_load_s3): Likewise.
(emit_store_dst): New function.

--HG--
branch : new_instruction_format

* src/vm/jit/mips/emit.c (emit_load): New function.
(emit_load_s1): Implemented in terms of emit_load.
(emit_load_s2): Likewise.
(emit_load_s3): Likewise.
(emit_store_dst): New function.

--HG--
branch : new_instruction_format

* src/vm/jit/stack.c (new_stack_analyse): Implement conflict checking
and coalescing for *STORE.
* src/vm/jit/show.c (new_show_stackvar): Show coalescing info.

--HG--
branch : new_instruction_format

* src/vm/jit/stack.c (new_stack_analyse): Mark all in and out
Stackslots of Basic Blocks as STACKVAR.

* src/vm/jit/i386/codegen.c (codegen): Removed copy of interfaces
to in and from out stackslots.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc64/codegen.c (codegen): ++lookup in LOOKUPSWITCH
loop.
* src/vm/jit/powerpc64/codegen.c (codegen): Ported to new instruction
format.

--HG--
branch : new_instruction_format

* src/vm/jit/i386/codegen.c (codegen): Port LASTORECONST, PUT*CONST.

--HG--
branch : new_instruction_format

* src/vm/jit/mips/codegen.c (codegen): Ported to new instruction format.

--HG--
branch : new_instruction_format

* src/vm/jit/powerpc/emit.c: Updated to new instruction format.
* src/vm/jit/powerpc/codegen.c: Likewise.

--HG--
branch : new_instruction_format

* src/vm/builtin.c (builtin_print_argument): Print decimal values for
int and long arguments.

--HG--
branch : new_instruction_format

* i386/emit.c: Changed to new instruction format.
* i386/codegen.c: Likewise.
* i386/codegen.h: Likewise.
* parse.c: Likewise.
* parse.h: Likewise.
* jit.h: Likewise.

--HG--
branch : new_instruction_format

* src/vm/jit/show.c (new_show_icmd): Show LOOKUPSWITCH targets.

--HG--
branch : new_instruction_format

* src/vm/jit/alpha/codegen.c (codegen): Port MULTIANEWARRAY.

--HG--
branch : new_instruction_format

* sarc/vm/jit/parse.c (parse): Check return value of
lock_monitor_enter.

--HG--
branch : new_instruction_format

* src/threads/native/lock.h (lock_monitor_enter): Return bool.
* src/threads/native/lock.c (lock_monitor_enter): Check for
NullPointerException.

--HG--
branch : new_instruction_format

* src/vm/jit/cfg.c (cfg_build): It's better to not reuse the loop
variable.

--HG--
branch : new_instruction_format

* src/vm/jit/show.c (new_show_icmd): Show BLOCK_OF tableswitch
targets.

--HG--
branch : new_instruction_format

* src/vm/jit/show.c (new_show_icmd): Show TABLESWITCH targets.

--HG--
branch : new_instruction_format