| Index: test/cctest/interpreter/bytecode_expectations/BasicLoops.golden
|
| diff --git a/test/cctest/interpreter/bytecode_expectations/BasicLoops.golden b/test/cctest/interpreter/bytecode_expectations/BasicLoops.golden
|
| index 4112b3e845f9a9b0e9bb3aca761ce94e59d26c51..1cbd05fcea8a5f3eb550caf512f2e2dca4c09475 100644
|
| --- a/test/cctest/interpreter/bytecode_expectations/BasicLoops.golden
|
| +++ b/test/cctest/interpreter/bytecode_expectations/BasicLoops.golden
|
| @@ -63,7 +63,7 @@ snippet: "
|
| "
|
| frame size: 2
|
| parameter count: 1
|
| -bytecode array length: 54
|
| +bytecode array length: 53
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -72,13 +72,12 @@ bytecodes: [
|
| B(Star), R(1),
|
| /* 65 S> */ B(LdaSmi), U8(10),
|
| /* 65 E> */ B(TestLessThan), R(0), U8(2),
|
| - B(JumpIfFalse), U8(38),
|
| + B(JumpIfFalse), U8(37),
|
| /* 56 E> */ B(StackCheck),
|
| /* 75 S> */ B(LdaSmi), U8(12),
|
| - /* 81 E> */ B(Mul), R(1), U8(3),
|
| + B(Mul), R(1), U8(3),
|
| B(Star), R(1),
|
| - /* 89 S> */ B(LdaSmi), U8(1),
|
| - /* 95 E> */ B(Add), R(0), U8(4),
|
| + /* 89 S> */ B(AddSmi), U8(1), R(0), U8(4),
|
| B(Star), R(0),
|
| /* 102 S> */ B(LdaSmi), U8(3),
|
| /* 108 E> */ B(TestEqual), R(0), U8(5),
|
| @@ -88,7 +87,7 @@ bytecodes: [
|
| /* 132 E> */ B(TestEqual), R(0), U8(6),
|
| B(JumpIfFalse), U8(4),
|
| /* 138 S> */ B(Jump), U8(5),
|
| - B(JumpLoop), U8(-40), U8(0),
|
| + B(JumpLoop), U8(-39), U8(0),
|
| /* 147 S> */ B(Ldar), R(1),
|
| /* 157 S> */ B(Return),
|
| ]
|
| @@ -112,7 +111,7 @@ snippet: "
|
| "
|
| frame size: 1
|
| parameter count: 1
|
| -bytecode array length: 62
|
| +bytecode array length: 61
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -121,27 +120,26 @@ bytecodes: [
|
| /* 62 S> */ B(LdaZero),
|
| /* 68 E> */ B(TestLessThan), R(0), U8(2),
|
| B(JumpIfFalse), U8(4),
|
| - /* 73 S> */ B(Jump), U8(45),
|
| + /* 73 S> */ B(Jump), U8(44),
|
| /* 85 S> */ B(LdaSmi), U8(3),
|
| /* 91 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 97 S> */ B(Jump), U8(39),
|
| + /* 97 S> */ B(Jump), U8(38),
|
| /* 106 S> */ B(LdaSmi), U8(4),
|
| /* 112 E> */ B(TestEqual), R(0), U8(4),
|
| B(JumpIfFalse), U8(4),
|
| - /* 118 S> */ B(Jump), U8(30),
|
| + /* 118 S> */ B(Jump), U8(29),
|
| /* 127 S> */ B(LdaSmi), U8(10),
|
| /* 133 E> */ B(TestEqual), R(0), U8(5),
|
| B(JumpIfFalse), U8(4),
|
| - /* 140 S> */ B(Jump), U8(18),
|
| + /* 140 S> */ B(Jump), U8(17),
|
| /* 152 S> */ B(LdaSmi), U8(5),
|
| /* 158 E> */ B(TestEqual), R(0), U8(6),
|
| B(JumpIfFalse), U8(4),
|
| - /* 164 S> */ B(Jump), U8(12),
|
| - /* 173 S> */ B(LdaSmi), U8(1),
|
| - /* 179 E> */ B(Add), R(0), U8(7),
|
| + /* 164 S> */ B(Jump), U8(11),
|
| + /* 173 S> */ B(AddSmi), U8(1), R(0), U8(7),
|
| B(Star), R(0),
|
| - B(JumpLoop), U8(-52), U8(0),
|
| + B(JumpLoop), U8(-51), U8(0),
|
| /* 186 S> */ B(Ldar), R(0),
|
| /* 196 S> */ B(Return),
|
| ]
|
| @@ -165,7 +163,7 @@ snippet: "
|
| "
|
| frame size: 1
|
| parameter count: 1
|
| -bytecode array length: 44
|
| +bytecode array length: 42
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -173,18 +171,16 @@ bytecodes: [
|
| /* 45 E> */ B(StackCheck),
|
| /* 71 S> */ B(LdaSmi), U8(3),
|
| /* 71 E> */ B(TestLessThan), R(0), U8(2),
|
| - B(JumpIfFalse), U8(22),
|
| + B(JumpIfFalse), U8(21),
|
| /* 62 E> */ B(StackCheck),
|
| /* 82 S> */ B(LdaSmi), U8(2),
|
| /* 88 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 94 S> */ B(Jump), U8(12),
|
| - /* 105 S> */ B(LdaSmi), U8(1),
|
| - /* 111 E> */ B(Add), R(0), U8(4),
|
| + /* 94 S> */ B(Jump), U8(11),
|
| + /* 105 S> */ B(AddSmi), U8(1), R(0), U8(4),
|
| B(Star), R(0),
|
| - B(JumpLoop), U8(-24), U8(1),
|
| - /* 122 S> */ B(LdaSmi), U8(1),
|
| - /* 128 E> */ B(Add), R(0), U8(5),
|
| + B(JumpLoop), U8(-23), U8(1),
|
| + /* 122 S> */ B(AddSmi), U8(1), R(0), U8(5),
|
| B(Star), R(0),
|
| /* 135 S> */ B(Jump), U8(2),
|
| /* 144 S> */ B(Ldar), R(0),
|
| @@ -207,7 +203,7 @@ snippet: "
|
| "
|
| frame size: 2
|
| parameter count: 1
|
| -bytecode array length: 34
|
| +bytecode array length: 33
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaSmi), U8(10),
|
| @@ -215,15 +211,14 @@ bytecodes: [
|
| /* 54 S> */ B(LdaSmi), U8(1),
|
| B(Star), R(1),
|
| /* 64 S> */ B(Ldar), R(0),
|
| - B(JumpIfToBooleanFalse), U8(20),
|
| + B(JumpIfToBooleanFalse), U8(19),
|
| /* 57 E> */ B(StackCheck),
|
| /* 71 S> */ B(LdaSmi), U8(12),
|
| - /* 77 E> */ B(Mul), R(1), U8(2),
|
| + B(Mul), R(1), U8(2),
|
| B(Star), R(1),
|
| - /* 85 S> */ B(LdaSmi), U8(1),
|
| - /* 91 E> */ B(Sub), R(0), U8(3),
|
| + /* 85 S> */ B(SubSmi), U8(1), R(0), U8(3),
|
| B(Star), R(0),
|
| - B(JumpLoop), U8(-19), U8(0),
|
| + B(JumpLoop), U8(-18), U8(0),
|
| /* 98 S> */ B(Ldar), R(1),
|
| /* 108 S> */ B(Return),
|
| ]
|
| @@ -245,7 +240,7 @@ snippet: "
|
| "
|
| frame size: 2
|
| parameter count: 1
|
| -bytecode array length: 54
|
| +bytecode array length: 53
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -254,23 +249,22 @@ bytecodes: [
|
| B(Star), R(1),
|
| /* 56 E> */ B(StackCheck),
|
| /* 63 S> */ B(LdaSmi), U8(10),
|
| - /* 69 E> */ B(Mul), R(1), U8(2),
|
| + B(Mul), R(1), U8(2),
|
| B(Star), R(1),
|
| /* 77 S> */ B(LdaSmi), U8(5),
|
| /* 83 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 89 S> */ B(Jump), U8(28),
|
| + /* 89 S> */ B(Jump), U8(27),
|
| /* 98 S> */ B(LdaSmi), U8(6),
|
| /* 104 E> */ B(TestEqual), R(0), U8(4),
|
| B(JumpIfFalse), U8(4),
|
| - /* 110 S> */ B(Jump), U8(9),
|
| - /* 122 S> */ B(LdaSmi), U8(1),
|
| - /* 128 E> */ B(Add), R(0), U8(5),
|
| + /* 110 S> */ B(Jump), U8(8),
|
| + /* 122 S> */ B(AddSmi), U8(1), R(0), U8(5),
|
| B(Star), R(0),
|
| /* 144 S> */ B(LdaSmi), U8(10),
|
| /* 144 E> */ B(TestLessThan), R(0), U8(6),
|
| B(JumpIfFalse), U8(5),
|
| - B(JumpLoop), U8(-40), U8(0),
|
| + B(JumpLoop), U8(-39), U8(0),
|
| /* 151 S> */ B(Ldar), R(1),
|
| /* 161 S> */ B(Return),
|
| ]
|
| @@ -291,7 +285,7 @@ snippet: "
|
| "
|
| frame size: 2
|
| parameter count: 1
|
| -bytecode array length: 32
|
| +bytecode array length: 31
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaSmi), U8(10),
|
| @@ -300,13 +294,12 @@ bytecodes: [
|
| B(Star), R(1),
|
| /* 57 E> */ B(StackCheck),
|
| /* 64 S> */ B(LdaSmi), U8(12),
|
| - /* 70 E> */ B(Mul), R(1), U8(2),
|
| + B(Mul), R(1), U8(2),
|
| B(Star), R(1),
|
| - /* 78 S> */ B(LdaSmi), U8(1),
|
| - /* 84 E> */ B(Sub), R(0), U8(3),
|
| + /* 78 S> */ B(SubSmi), U8(1), R(0), U8(3),
|
| B(Star), R(0),
|
| /* 98 S> */ B(JumpIfToBooleanFalse), U8(5),
|
| - B(JumpLoop), U8(-17), U8(0),
|
| + B(JumpLoop), U8(-16), U8(0),
|
| /* 102 S> */ B(Ldar), R(1),
|
| /* 112 S> */ B(Return),
|
| ]
|
| @@ -328,7 +321,7 @@ snippet: "
|
| "
|
| frame size: 2
|
| parameter count: 1
|
| -bytecode array length: 44
|
| +bytecode array length: 43
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -337,14 +330,13 @@ bytecodes: [
|
| B(Star), R(1),
|
| /* 56 E> */ B(StackCheck),
|
| /* 63 S> */ B(LdaSmi), U8(10),
|
| - /* 69 E> */ B(Mul), R(1), U8(2),
|
| + B(Mul), R(1), U8(2),
|
| B(Star), R(1),
|
| /* 77 S> */ B(LdaSmi), U8(5),
|
| /* 83 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 89 S> */ B(Jump), U8(18),
|
| - /* 98 S> */ B(LdaSmi), U8(1),
|
| - /* 104 E> */ B(Add), R(0), U8(4),
|
| + /* 89 S> */ B(Jump), U8(17),
|
| + /* 98 S> */ B(AddSmi), U8(1), R(0), U8(4),
|
| B(Star), R(0),
|
| /* 111 S> */ B(LdaSmi), U8(6),
|
| /* 117 E> */ B(TestEqual), R(0), U8(5),
|
| @@ -371,7 +363,7 @@ snippet: "
|
| "
|
| frame size: 2
|
| parameter count: 1
|
| -bytecode array length: 47
|
| +bytecode array length: 46
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -380,20 +372,19 @@ bytecodes: [
|
| B(Star), R(1),
|
| /* 56 E> */ B(StackCheck),
|
| /* 63 S> */ B(LdaSmi), U8(10),
|
| - /* 69 E> */ B(Mul), R(1), U8(2),
|
| + B(Mul), R(1), U8(2),
|
| B(Star), R(1),
|
| /* 77 S> */ B(LdaSmi), U8(5),
|
| /* 83 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 89 S> */ B(Jump), U8(21),
|
| - /* 98 S> */ B(LdaSmi), U8(1),
|
| - /* 104 E> */ B(Add), R(0), U8(4),
|
| + /* 89 S> */ B(Jump), U8(20),
|
| + /* 98 S> */ B(AddSmi), U8(1), R(0), U8(4),
|
| B(Star), R(0),
|
| /* 111 S> */ B(LdaSmi), U8(6),
|
| /* 117 E> */ B(TestEqual), R(0), U8(5),
|
| B(JumpIfFalse), U8(4),
|
| /* 123 S> */ B(Jump), U8(2),
|
| - B(JumpLoop), U8(-33), U8(0),
|
| + B(JumpLoop), U8(-32), U8(0),
|
| /* 149 S> */ B(Ldar), R(1),
|
| /* 159 S> */ B(Return),
|
| ]
|
| @@ -413,7 +404,7 @@ snippet: "
|
| "
|
| frame size: 1
|
| parameter count: 1
|
| -bytecode array length: 35
|
| +bytecode array length: 34
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -422,15 +413,14 @@ bytecodes: [
|
| /* 58 S> */ B(LdaSmi), U8(1),
|
| /* 64 E> */ B(TestEqual), R(0), U8(2),
|
| B(JumpIfFalse), U8(4),
|
| - /* 70 S> */ B(Jump), U8(21),
|
| + /* 70 S> */ B(Jump), U8(20),
|
| /* 79 S> */ B(LdaSmi), U8(2),
|
| /* 85 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 91 S> */ B(Jump), U8(9),
|
| - /* 103 S> */ B(LdaSmi), U8(1),
|
| - /* 109 E> */ B(Add), R(0), U8(4),
|
| + /* 91 S> */ B(Jump), U8(8),
|
| + /* 103 S> */ B(AddSmi), U8(1), R(0), U8(4),
|
| B(Star), R(0),
|
| - B(JumpLoop), U8(-26), U8(0),
|
| + B(JumpLoop), U8(-25), U8(0),
|
| B(LdaUndefined),
|
| /* 116 S> */ B(Return),
|
| ]
|
| @@ -449,7 +439,7 @@ snippet: "
|
| "
|
| frame size: 1
|
| parameter count: 1
|
| -bytecode array length: 35
|
| +bytecode array length: 34
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 47 S> */ B(LdaZero),
|
| @@ -458,15 +448,14 @@ bytecodes: [
|
| /* 56 S> */ B(LdaSmi), U8(1),
|
| /* 62 E> */ B(TestEqual), R(0), U8(2),
|
| B(JumpIfFalse), U8(4),
|
| - /* 68 S> */ B(Jump), U8(21),
|
| + /* 68 S> */ B(Jump), U8(20),
|
| /* 77 S> */ B(LdaSmi), U8(2),
|
| /* 83 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 89 S> */ B(Jump), U8(9),
|
| - /* 101 S> */ B(LdaSmi), U8(1),
|
| - /* 107 E> */ B(Add), R(0), U8(4),
|
| + /* 89 S> */ B(Jump), U8(8),
|
| + /* 101 S> */ B(AddSmi), U8(1), R(0), U8(4),
|
| B(Star), R(0),
|
| - B(JumpLoop), U8(-26), U8(0),
|
| + B(JumpLoop), U8(-25), U8(0),
|
| B(LdaUndefined),
|
| /* 114 S> */ B(Return),
|
| ]
|
| @@ -485,7 +474,7 @@ snippet: "
|
| "
|
| frame size: 1
|
| parameter count: 1
|
| -bytecode array length: 35
|
| +bytecode array length: 34
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -494,15 +483,14 @@ bytecodes: [
|
| /* 68 S> */ B(LdaSmi), U8(1),
|
| /* 74 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 80 S> */ B(Jump), U8(21),
|
| + /* 80 S> */ B(Jump), U8(20),
|
| /* 89 S> */ B(LdaSmi), U8(2),
|
| /* 95 E> */ B(TestEqual), R(0), U8(4),
|
| B(JumpIfFalse), U8(4),
|
| /* 101 S> */ B(Jump), U8(2),
|
| - /* 55 S> */ B(LdaSmi), U8(1),
|
| - /* 59 E> */ B(Add), R(0), U8(2),
|
| + /* 55 S> */ B(AddSmi), U8(1), R(0), U8(2),
|
| B(Star), R(0),
|
| - B(JumpLoop), U8(-26), U8(0),
|
| + B(JumpLoop), U8(-25), U8(0),
|
| B(LdaUndefined),
|
| /* 113 S> */ B(Return),
|
| ]
|
| @@ -520,7 +508,7 @@ snippet: "
|
| "
|
| frame size: 1
|
| parameter count: 1
|
| -bytecode array length: 35
|
| +bytecode array length: 34
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 47 S> */ B(LdaZero),
|
| @@ -529,15 +517,14 @@ bytecodes: [
|
| /* 66 S> */ B(LdaSmi), U8(1),
|
| /* 72 E> */ B(TestEqual), R(0), U8(3),
|
| B(JumpIfFalse), U8(4),
|
| - /* 78 S> */ B(Jump), U8(21),
|
| + /* 78 S> */ B(Jump), U8(20),
|
| /* 87 S> */ B(LdaSmi), U8(2),
|
| /* 93 E> */ B(TestEqual), R(0), U8(4),
|
| B(JumpIfFalse), U8(4),
|
| /* 99 S> */ B(Jump), U8(2),
|
| - /* 53 S> */ B(LdaSmi), U8(1),
|
| - /* 57 E> */ B(Add), R(0), U8(2),
|
| + /* 53 S> */ B(AddSmi), U8(1), R(0), U8(2),
|
| B(Star), R(0),
|
| - B(JumpLoop), U8(-26), U8(0),
|
| + B(JumpLoop), U8(-25), U8(0),
|
| B(LdaUndefined),
|
| /* 111 S> */ B(Return),
|
| ]
|
| @@ -556,7 +543,7 @@ snippet: "
|
| "
|
| frame size: 2
|
| parameter count: 1
|
| -bytecode array length: 36
|
| +bytecode array length: 34
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -565,16 +552,14 @@ bytecodes: [
|
| B(Star), R(1),
|
| /* 63 S> */ B(LdaSmi), U8(100),
|
| /* 63 E> */ B(TestLessThan), R(1), U8(2),
|
| - B(JumpIfFalse), U8(22),
|
| + B(JumpIfFalse), U8(20),
|
| /* 45 E> */ B(StackCheck),
|
| - /* 85 S> */ B(LdaSmi), U8(1),
|
| - /* 91 E> */ B(Add), R(0), U8(4),
|
| + /* 85 S> */ B(AddSmi), U8(1), R(0), U8(4),
|
| B(Star), R(0),
|
| /* 98 S> */ B(Jump), U8(2),
|
| - /* 72 S> */ B(LdaSmi), U8(1),
|
| - /* 76 E> */ B(Add), R(1), U8(3),
|
| + /* 72 S> */ B(AddSmi), U8(1), R(1), U8(3),
|
| B(Star), R(1),
|
| - B(JumpLoop), U8(-24), U8(0),
|
| + B(JumpLoop), U8(-22), U8(0),
|
| B(LdaUndefined),
|
| /* 110 S> */ B(Return),
|
| ]
|
| @@ -604,7 +589,7 @@ bytecodes: [
|
| B(JumpIfToBooleanFalse), U8(19),
|
| /* 45 E> */ B(StackCheck),
|
| /* 74 S> */ B(LdaSmi), U8(12),
|
| - /* 80 E> */ B(Mul), R(0), U8(3),
|
| + B(Mul), R(0), U8(3),
|
| B(Star), R(0),
|
| /* 67 S> */ B(Ldar), R(1),
|
| B(Dec), U8(2),
|
| @@ -654,7 +639,7 @@ snippet: "
|
| "
|
| frame size: 2
|
| parameter count: 1
|
| -bytecode array length: 36
|
| +bytecode array length: 35
|
| bytecodes: [
|
| /* 30 E> */ B(StackCheck),
|
| /* 42 S> */ B(LdaZero),
|
| @@ -662,8 +647,7 @@ bytecodes: [
|
| /* 58 S> */ B(LdaZero),
|
| B(Star), R(1),
|
| /* 45 E> */ B(StackCheck),
|
| - /* 76 S> */ B(LdaSmi), U8(1),
|
| - /* 82 E> */ B(Add), R(0), U8(3),
|
| + /* 76 S> */ B(AddSmi), U8(1), R(0), U8(3),
|
| B(Star), R(0),
|
| /* 89 S> */ B(LdaSmi), U8(20),
|
| /* 95 E> */ B(TestEqual), R(0), U8(4),
|
| @@ -672,7 +656,7 @@ bytecodes: [
|
| /* 69 S> */ B(Ldar), R(1),
|
| B(Inc), U8(2),
|
| B(Star), R(1),
|
| - B(JumpLoop), U8(-23), U8(0),
|
| + B(JumpLoop), U8(-22), U8(0),
|
| /* 112 S> */ B(Ldar), R(0),
|
| /* 122 S> */ B(Return),
|
| ]
|
|
|