Merge branch 'bjorn/erts/relative-jumps'

* bjorn/erts/relative-jumps:
  Pack failure labels in i_select_val2 and i_select_tuple_arity2
  Optimize i_select_tuple_arity2 and is_select_lins
  Rewrite select_val_bins so that its labels can be packed
  Pack sequences of trailing 'f' operands
  Implement packing of 'f' and 'j'
  Make sure that mask literals are 64 bits
  Use relative failure labels
  Add information about offset to common group start position
  Remove JUMP_OFFSET
  Refactor instructions to support relative jumps
  Introduce a new trace_jump/1 instruction for tracing
  Avoid using $Src more than once

1 files changed, 17 insertions, 2 deletions

diff --git a/erts/emulator/beam/macros.tab b/erts/emulator/beam/macros.tab
index 35bbc92fea..6f9b78af6f 100644
--- a/erts/emulator/beam/macros.tab
+++ b/erts/emulator/beam/macros.tab
@@ -28,15 +28,30 @@ REFRESH_GEN_DEST() {
     dst_ptr = REG_TARGET_PTR(dst);
 }
 
+SET_I_REL(Offset) {
+    ASSERT(VALID_INSTR(*(I + ($Offset))));
+    I += $Offset;
+}
+
+SET_CP_I_ABS(Target) {
+    c_p->i = $Target;
+    ASSERT(VALID_INSTR(*c_p->i));
+}
+
+SET_REL_I(Dst, Offset) {
+    $Dst = I + ($Offset);
+    ASSERT(VALID_INSTR(*$Dst));
+}
+
 FAIL(Fail) {
     //| -no_prefetch
-    SET_I((BeamInstr *) $Fail);
+    $SET_I_REL($Fail);
     Goto(*I);
 }
 
 JUMP(Fail) {
     //| -no_next
-    SET_I((BeamInstr *) $Fail);
+    $SET_I_REL($Fail);
     Goto(*I);
 }