diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2017-09-15 21:12:59 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2017-09-15 21:12:59 +0200 |
commit | ecf1424456bd95167ac0e1e721307032e22d172f (patch) | |
tree | 61781a1a7f4a037cfe88afc0988555e0b17d9782 /compiler/vmgen.nim | |
parent | 0fe2a83dda25d682f04f7af0f73a50c45362c79f (diff) | |
parent | 8ea78b1bc9dc0b4d883b4f0750ee84e93605b82a (diff) | |
download | Nim-ecf1424456bd95167ac0e1e721307032e22d172f.tar.gz |
Merge branch 'devel' into araq
Diffstat (limited to 'compiler/vmgen.nim')
-rw-r--r-- | compiler/vmgen.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim index dbb8c9dcd..3d291d8a2 100644 --- a/compiler/vmgen.nim +++ b/compiler/vmgen.nim @@ -625,10 +625,10 @@ proc genUnaryABC(c: PCtx; n: PNode; dest: var TDest; opc: TOpcode) = c.gABC(n, opc, dest, tmp) c.freeTemp(tmp) -proc genUnaryABI(c: PCtx; n: PNode; dest: var TDest; opc: TOpcode) = +proc genUnaryABI(c: PCtx; n: PNode; dest: var TDest; opc: TOpcode; imm: BiggestInt=0) = let tmp = c.genx(n.sons[1]) if dest < 0: dest = c.getTemp(n.typ) - c.gABI(n, opc, dest, tmp, 0) + c.gABI(n, opc, dest, tmp, imm) c.freeTemp(tmp) proc genBinaryABC(c: PCtx; n: PNode; dest: var TDest; opc: TOpcode) = @@ -1021,7 +1021,7 @@ proc genMagic(c: PCtx; n: PNode; dest: var TDest; m: TMagic) = c.freeTemp(tmp) of mSlurp: genUnaryABC(c, n, dest, opcSlurp) of mStaticExec: genBinaryABCD(c, n, dest, opcGorge) - of mNLen: genUnaryABI(c, n, dest, opcLenSeq) + of mNLen: genUnaryABI(c, n, dest, opcLenSeq, nimNodeFlag) of mGetImpl: genUnaryABC(c, n, dest, opcGetImpl) of mNChild: genBinaryABC(c, n, dest, opcNChild) of mNSetChild, mNDel: |