diff options
-rw-r--r-- | tests/unit/src/android/net/apf/ApfTest.java | 54 |
1 files changed, 18 insertions, 36 deletions
diff --git a/tests/unit/src/android/net/apf/ApfTest.java b/tests/unit/src/android/net/apf/ApfTest.java index 1afff8c4..74704a6f 100644 --- a/tests/unit/src/android/net/apf/ApfTest.java +++ b/tests/unit/src/android/net/apf/ApfTest.java @@ -3959,8 +3959,7 @@ public class ApfTest { gen.addAdd(1); gen.addStoreData(R0, 0); gen.addLoad16(R0, 12); - gen.addLoadImmediate(R1, -120); - gen.addJumpIfR0LessThan(0x600, gen.mCountAndDropLabel); + gen.addCountAndDropIfR0LessThan(0x600, getCounterEnumFromOffset(-120)); gen.addLoadImmediate(R1, -124); gen.addJumpIfR0Equals(0x88a2, gen.mCountAndDropLabel); gen.addJumpIfR0Equals(0x88a4, gen.mCountAndDropLabel); @@ -3973,21 +3972,16 @@ public class ApfTest { gen.addCountAndDropIfBytesAtR0NotEqual(hexStringToByteArray("000108000604"), getCounterEnumFromOffset(-152)); gen.addLoad16(R0, 20); gen.addJumpIfR0Equals(0x1, "LABEL_104"); - gen.addLoadImmediate(R1, -156); - gen.addJumpIfR0NotEquals(0x2, gen.mCountAndDropLabel); + gen.addCountAndDropIfR0NotEquals(0x2, getCounterEnumFromOffset(-156)); gen.addLoad32(R0, 28); - gen.addLoadImmediate(R1, -128); - gen.addJumpIfR0Equals(0x0, gen.mCountAndDropLabel); + gen.addCountAndDropIfR0Equals(0x0, getCounterEnumFromOffset(-128)); gen.addLoadImmediate(R0, 0); - gen.addLoadImmediate(R1, -56); - gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), gen.mCountAndPassLabel); + gen.addCountAndPassIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), getCounterEnumFromOffset(-56)); gen.defineLabel("LABEL_104"); gen.addLoadImmediate(R0, 38); - gen.addLoadImmediate(R1, -80); - gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("c0a801ec"), gen.mCountAndDropLabel); - gen.addLoadImmediate(R1, -20); - gen.addJump(gen.mCountAndPassLabel); + gen.addCountAndDropIfBytesAtR0NotEqual(hexStringToByteArray("c0a801ec"), getCounterEnumFromOffset(-80)); + gen.addCountAndPass(getCounterEnumFromOffset(-20)); gen.defineLabel("LABEL_122"); gen.addLoad16(R0, 12); @@ -4002,19 +3996,16 @@ public class ApfTest { gen.addLoadImmediate(R0, 50); gen.addAddR1ToR0(); gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("7e9046bc7008"), "LABEL_165"); - gen.addLoadImmediate(R1, -24); - gen.addJump(gen.mCountAndPassLabel); + gen.addCountAndPass(getCounterEnumFromOffset(-24)); gen.defineLabel("LABEL_165"); gen.addLoad8(R0, 30); gen.addAnd(240); - gen.addLoadImmediate(R1, -96); - gen.addJumpIfR0Equals(0xe0, gen.mCountAndDropLabel); + gen.addCountAndDropIfR0Equals(0xe0, getCounterEnumFromOffset(-96)); gen.addLoadImmediate(R1, -88); gen.addLoad32(R0, 30); gen.addJumpIfR0Equals(0xffffffff, gen.mCountAndDropLabel); - gen.addLoadImmediate(R1, -92); - gen.addJumpIfR0Equals(0xc0a801ff, gen.mCountAndDropLabel); + gen.addCountAndDropIfR0Equals(0xc0a801ff, getCounterEnumFromOffset(-92)); gen.addLoad8(R0, 23); gen.addJumpIfR0NotEquals(0x6, "LABEL_225"); gen.addLoad16(R0, 20); @@ -4022,25 +4013,20 @@ public class ApfTest { gen.addLoadFromMemory(R1, MemorySlot.IPV4_HEADER_SIZE); gen.addLoad16Indexed(R0, 16); gen.addJumpIfR0NotEquals(0x7, "LABEL_225"); - gen.addLoadImmediate(R1, -148); - gen.addJump(gen.mCountAndDropLabel); + gen.addCountAndDrop(getCounterEnumFromOffset(-148)); gen.defineLabel("LABEL_225"); gen.addLoadImmediate(R1, -36); gen.addLoadImmediate(R0, 0); gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), gen.mCountAndPassLabel); - gen.addLoadImmediate(R1, -84); - gen.addJump(gen.mCountAndDropLabel); - gen.addLoadImmediate(R1, -28); - gen.addJump(gen.mCountAndPassLabel); + gen.addCountAndDrop(getCounterEnumFromOffset(-84)); + gen.addCountAndPass(getCounterEnumFromOffset(-28)); gen.defineLabel("LABEL_249"); gen.addJumpIfR0Equals(0x86dd, "LABEL_273"); gen.addLoadImmediate(R0, 0); - gen.addLoadImmediate(R1, -60); - gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), gen.mCountAndPassLabel); - gen.addLoadImmediate(R1, -68); - gen.addJump(gen.mCountAndDropLabel); + gen.addCountAndPassIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), getCounterEnumFromOffset(-60)); + gen.addCountAndDrop(getCounterEnumFromOffset(-68)); gen.defineLabel("LABEL_273"); gen.addLoad8(R0, 20); @@ -4049,18 +4035,15 @@ public class ApfTest { gen.addLoadImmediate(R1, -116); gen.addLoad8(R0, 38); gen.addJumpIfR0Equals(0xff, gen.mCountAndDropLabel); - gen.addLoadImmediate(R1, -44); - gen.addJump(gen.mCountAndPassLabel); + gen.addCountAndPass(getCounterEnumFromOffset(-44)); gen.defineLabel("LABEL_297"); gen.addLoad8(R0, 54); - gen.addLoadImmediate(R1, -100); - gen.addJumpIfR0Equals(0x85, gen.mCountAndDropLabel); + gen.addCountAndDropIfR0Equals(0x85, getCounterEnumFromOffset(-100)); gen.addJumpIfR0NotEquals(0x88, "LABEL_333"); gen.addLoadImmediate(R0, 38); gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ff0200000000000000000000000000"), "LABEL_333"); - gen.addLoadImmediate(R1, -104); - gen.addJump(gen.mCountAndDropLabel); + gen.addCountAndDrop(getCounterEnumFromOffset(-104)); gen.defineLabel("LABEL_333"); gen.addLoadFromMemory(R0, MemorySlot.PACKET_SIZE); @@ -4105,8 +4088,7 @@ public class ApfTest { gen.defineLabel("LABEL_547"); gen.addLoadImmediate(R0, 126); gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("2401fa000480f00000000000000000010701"), "LABEL_574"); - gen.addLoadImmediate(R1, -72); - gen.addJump(gen.mCountAndDropLabel); + gen.addCountAndDrop(getCounterEnumFromOffset(-72)); gen.defineLabel("LABEL_574"); gen.addLoadImmediate(R1, -40); |