Author: [email protected]
Branch: py3.5-raffael_t
Changeset: r83940:8b981defbc71
Date: 2016-03-21 23:29 +0100
http://bitbucket.org/pypy/pypy/changeset/8b981defbc71/
Log: Change to right opcode for matmul
diff --git a/pypy/interpreter/astcompiler/assemble.py
b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astcompiler/assemble.py
+++ b/pypy/interpreter/astcompiler/assemble.py
@@ -567,7 +567,7 @@
ops.BINARY_SUBSCR: -1,
ops.BINARY_FLOOR_DIVIDE: -1,
ops.BINARY_TRUE_DIVIDE: -1,
- ops.BINARY_MAT_MUL: -1,
+ ops.BINARY_MATRIX_MULTIPLY: -1,
ops.BINARY_LSHIFT: -1,
ops.BINARY_RSHIFT: -1,
ops.BINARY_AND: -1,
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpreter/pyopcode.py
@@ -228,8 +228,8 @@
self.BINARY_AND(oparg, next_instr)
elif opcode == opcodedesc.BINARY_FLOOR_DIVIDE.index:
self.BINARY_FLOOR_DIVIDE(oparg, next_instr)
- elif opcode == opcodedesc.BINARY_MAT_MUL.index:
- self.BINARY_MAT_MUL(oparg, next_instr)
+ elif opcode == opcodedesc.BINARY_MATRIX_MULTIPLY.index:
+ self.BINARY_MATRIX_MULTIPLY(oparg, next_instr)
elif opcode == opcodedesc.BINARY_LSHIFT.index:
self.BINARY_LSHIFT(oparg, next_instr)
elif opcode == opcodedesc.BINARY_MODULO.index:
@@ -572,7 +572,7 @@
BINARY_MULTIPLY = binaryoperation("mul")
BINARY_TRUE_DIVIDE = binaryoperation("truediv")
BINARY_FLOOR_DIVIDE = binaryoperation("floordiv")
- BINARY_MAT_MUL = binaryoperation("matmul")
+ BINARY_MATRIX_MULTIPLY = binaryoperation("matmul")
BINARY_DIVIDE = binaryoperation("div")
# XXX BINARY_DIVIDE must fall back to BINARY_TRUE_DIVIDE with -Qnew
BINARY_MODULO = binaryoperation("mod")
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
