aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/ops.tab
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-04-13 12:17:35 +0000
committerErlang/OTP <[email protected]>2010-04-13 12:17:35 +0000
commitddceb09ba9f19da33c2fc45c5230c510221cc96e (patch)
tree92f9fc0d5606b4b3a79fa9a88c0613c1c2c7b8dd /erts/emulator/beam/ops.tab
parentc21626f453903b05655da48420f106bda31cb2da (diff)
parentfd9bb9fb7323ead417fff0cbb7a077b342446a77 (diff)
downloadotp-ddceb09ba9f19da33c2fc45c5230c510221cc96e.tar.gz
otp-ddceb09ba9f19da33c2fc45c5230c510221cc96e.tar.bz2
otp-ddceb09ba9f19da33c2fc45c5230c510221cc96e.zip
Merge branch 'bg/fconv' into dev
* bg/fconv: erts: Fix loading of modules with invalid floating point arithmetic
Diffstat (limited to 'erts/emulator/beam/ops.tab')
-rw-r--r--erts/emulator/beam/ops.tab2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index 231ea34fd5..9e8ac74f40 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -1304,7 +1304,7 @@ fmul p FR1 FR2 FR3 => i_fmul FR1 FR2 FR3
fdiv p FR1 FR2 FR3 => i_fdiv FR1 FR2 FR3
fnegate p FR1 FR2 => i_fnegate FR1 FR2
-fconv Int=iq Dst=l => move Int x | fconv x Dst
+fconv Arg=iqan Dst=l => move Arg x | fconv x Dst
fmove q l
fmove d l