aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-09-15 17:58:33 +0200
committerBjörn-Egil Dahlberg <[email protected]>2015-04-23 14:37:32 +0200
commit63949dcd13e24bdc73336b0f5e88d4f06cce56c1 (patch)
tree5a2fe60b50a6ce515b3518f4b35859fd8b79dc20
parent177d20a7329d24aec0f4a0cbbbd3fc803bcbba4b (diff)
downloadotp-63949dcd13e24bdc73336b0f5e88d4f06cce56c1.tar.gz
otp-63949dcd13e24bdc73336b0f5e88d4f06cce56c1.tar.bz2
otp-63949dcd13e24bdc73336b0f5e88d4f06cce56c1.zip
erts: Add instruction move3 for xy and xx
-rw-r--r--erts/emulator/beam/beam_emu.c3
-rw-r--r--erts/emulator/beam/ops.tab8
2 files changed, 10 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index aad76e9a93..8b9e271068 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -562,7 +562,8 @@ void** beam_ops;
Store(term, Dst); \
} while (0)
-#define Move2(src1, dst1, src2, dst2) dst1 = (src1); dst2 = (src2)
+#define Move2(S1, D1, S2, D2) D1 = (S1); D2 = (S2)
+#define Move3(S1, D1, S2, D2, S3, D3) D1 = (S1); D2 = (S2); D3 = (S3)
#define MoveGenDest(src, dstp) \
if ((dstp) == NULL) { r(0) = (src); } else { *(dstp) = src; }
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index 9330192d04..66339f8ace 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -302,6 +302,9 @@ move X1=x Y1=y | move X2=x Y2=y => move2 X1 Y1 X2 Y2
move Y1=y X1=x | move Y2=y X2=x => move2 Y1 X1 Y2 X2
move X1=x X2=x | move X3=x X4=x => move2 X1 X2 X3 X4
+move2 X1=x Y1=y X2=x Y2=y | move X3=x Y3=y => move3 X1 Y1 X2 Y2 X3 Y3
+move2 Y1=y X1=x Y2=y X2=x | move Y3=y X3=x => move3 Y1 X1 Y2 X2 Y3 X3
+
move C=aiq X=x==1 => move_x1 C
move C=aiq X=x==2 => move_x2 C
@@ -313,6 +316,11 @@ move2 x y x y
move2 y x y x
move2 x x x x
+%macro: move3 Move3
+move3 x y x y x y
+move3 y x y x y x
+move3 x x x x x x
+
# The compiler almost never generates a "move Literal y(Y)" instruction,
# so let's cheat if we encounter one.
move S=n D=y => init D