Apf: rename addLoad32(R0, x) -> addLoad32intoR0(x)
This is to allow 'LDW R=1' to be repurposed in the future.
Generated via:
f=(src/android/net/apf/ApfFilter.java src/android/net/apf/ApfV4GeneratorBase.java tests/unit/src/android/net/apf/ApfGeneratorTest.kt tests/unit/src/android/net/apf/ApfStandaloneTest.kt tests/unit/src/android/net/apf/ApfTest.java)
for i in ${f[@]}; do echo $i; sed -i -r 's@addLoad32[(]R0, @addLoad32intoR0(@' "$i"; done
git grep 'addLoad32[(]'
mcedit src/android/net/apf/ApfV4GeneratorBase.java:129
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I8cd52cc5157e669eaca33c2b1ea334a1fc00fdbb
diff --git a/src/android/net/apf/ApfFilter.java b/src/android/net/apf/ApfFilter.java
index 35fe7c9..8ad74be 100644
--- a/src/android/net/apf/ApfFilter.java
+++ b/src/android/net/apf/ApfFilter.java
@@ -1446,7 +1446,7 @@
switch (section.length) {
// length asserted to be either 2 or 4 on PacketSection construction
case 2: gen.addLoad16(R0, section.start); break;
- case 4: gen.addLoad32(R0, section.start); break;
+ case 4: gen.addLoad32intoR0(section.start); break;
}
// WARNING: keep this in sync with matches()!
@@ -1824,7 +1824,7 @@
/*---------- Handle ARP Replies. ----------*/
// Drop if ARP reply source IP is 0.0.0.0
- gen.addLoad32(R0, ARP_SOURCE_IP_ADDRESS_OFFSET);
+ gen.addLoad32intoR0(ARP_SOURCE_IP_ADDRESS_OFFSET);
gen.addCountAndDropIfR0Equals(IPV4_ANY_HOST_ADDRESS, DROPPED_ARP_REPLY_SPA_NO_HOST);
// Pass if non-broadcast reply.
@@ -1835,12 +1835,12 @@
// It is a broadcast reply.
if (mIPv4Address == null) {
// When there is no IPv4 address, drop GARP replies (b/29404209).
- gen.addLoad32(R0, ARP_TARGET_IP_ADDRESS_OFFSET);
+ gen.addLoad32intoR0(ARP_TARGET_IP_ADDRESS_OFFSET);
gen.addCountAndDropIfR0Equals(IPV4_ANY_HOST_ADDRESS, DROPPED_GARP_REPLY);
} else {
// When there is an IPv4 address, drop broadcast replies with a different target IPv4
// address.
- gen.addLoad32(R0, ARP_TARGET_IP_ADDRESS_OFFSET);
+ gen.addLoad32intoR0(ARP_TARGET_IP_ADDRESS_OFFSET);
gen.addCountAndDropIfR0NotEquals(bytesToBEInt(mIPv4Address), DROPPED_ARP_OTHER_HOST);
}
gen.addCountAndPass(PASSED_ARP_BROADCAST_REPLY);
@@ -1851,7 +1851,7 @@
if (mIPv4Address != null) {
// When there is an IPv4 address, drop unicast/broadcast requests with a different
// target IPv4 address.
- gen.addLoad32(R0, ARP_TARGET_IP_ADDRESS_OFFSET);
+ gen.addLoad32intoR0(ARP_TARGET_IP_ADDRESS_OFFSET);
gen.addCountAndDropIfR0NotEquals(bytesToBEInt(mIPv4Address), DROPPED_ARP_OTHER_HOST);
if (enableArpOffload()) {
@@ -1996,7 +1996,7 @@
// Some devices can use unicast queries for mDNS to improve performance and reliability.
// These packets are not currently offloaded and will be passed by APF and handled
// by NsdService.
- gen.addLoad32(R0, IPV4_DEST_ADDR_OFFSET)
+ gen.addLoad32intoR0(IPV4_DEST_ADDR_OFFSET)
.addJumpIfR0NotEquals(MDNS_IPV4_ADDR_IN_LONG, skipMdnsFilter);
// We now know that the packet is an mDNS packet,
@@ -2099,7 +2099,7 @@
if (mHasClat) {
// Check 1) it's not a fragment. 2) it's UDP.
// Load 16 bit frag flags/offset field, 8 bit ttl, 8 bit protocol
- gen.addLoad32(R0, IPV4_FRAGMENT_OFFSET_OFFSET);
+ gen.addLoad32intoR0(IPV4_FRAGMENT_OFFSET_OFFSET);
// Mask out the reserved and don't fragment bits, plus the TTL field.
// Because:
// IPV4_FRAGMENT_OFFSET_MASK = 0x1fff
@@ -2152,7 +2152,7 @@
gen.addCountAndDropIfR0Equals(0xe0, DROPPED_IPV4_MULTICAST);
// If IPv4 broadcast packet, drop regardless of L2 (b/30231088).
- gen.addLoad32(R0, IPV4_DEST_ADDR_OFFSET);
+ gen.addLoad32intoR0(IPV4_DEST_ADDR_OFFSET);
gen.addCountAndDropIfR0Equals(IPV4_BROADCAST_ADDRESS, DROPPED_IPV4_BROADCAST_ADDR);
if (mIPv4Address != null && mIPv4PrefixLength < 31) {
int broadcastAddr = ipv4BroadcastAddress(mIPv4Address, mIPv4PrefixLength);
@@ -2939,7 +2939,7 @@
// If we reach here, we know it is an IGMPv1/IGMPv2/IGMPv3 general query.
// The general query IPv4 destination address must be 224.0.0.1.
- v6Gen.addLoad32(R0, IPV4_DEST_ADDR_OFFSET)
+ v6Gen.addLoad32intoR0(IPV4_DEST_ADDR_OFFSET)
.addCountAndDropIfR0NotEquals(IPV4_ALL_HOSTS_ADDRESS_IN_LONG,
DROPPED_IGMP_INVALID);
diff --git a/src/android/net/apf/ApfV4GeneratorBase.java b/src/android/net/apf/ApfV4GeneratorBase.java
index ed6efe3..826fa6a 100644
--- a/src/android/net/apf/ApfV4GeneratorBase.java
+++ b/src/android/net/apf/ApfV4GeneratorBase.java
@@ -126,8 +126,8 @@
* Add an instruction to the end of the program to load 32-bits at offset {@code offset}
* bytes from the beginning of the packet into {@code register}.
*/
- public final Type addLoad32(Register r, int ofs) {
- return append(new Instruction(Opcodes.LDW, r).addPacketOffset(ofs));
+ public final Type addLoad32intoR0(int ofs) {
+ return append(new Instruction(Opcodes.LDW, R0).addPacketOffset(ofs));
}
/**
@@ -588,7 +588,7 @@
// hence this constant ends up being 0x3FFF00FF.
// We want the more flag bit and offset to be 0 (ie. not a fragment),
// so after this masking we end up with just the ip protocol.
- return addLoad32(R0, IPV4_FRAGMENT_OFFSET_OFFSET)
+ return addLoad32intoR0(IPV4_FRAGMENT_OFFSET_OFFSET)
.addAnd((IPV4_FRAGMENT_MORE_FRAGS_MASK | IPV4_FRAGMENT_OFFSET_MASK) << 16 | 0xFF)
.addJumpIfR0NotEquals(protocol, tgt);
}
diff --git a/tests/unit/src/android/net/apf/ApfStandaloneTest.kt b/tests/unit/src/android/net/apf/ApfStandaloneTest.kt
index 79fe2c4..0bf554f 100644
--- a/tests/unit/src/android/net/apf/ApfStandaloneTest.kt
+++ b/tests/unit/src/android/net/apf/ApfStandaloneTest.kt
@@ -314,10 +314,10 @@
// Pass DHCP addressed to us.
// Check src is IP is 0.0.0.0
- gen.addLoad32(R0, IPV4_SRC_ADDR_OFFSET)
+ gen.addLoad32intoR0(IPV4_SRC_ADDR_OFFSET)
gen.addJumpIfR0NotEquals(0, endOfDhcpFilter)
// Check dst ip is 255.255.255.255
- gen.addLoad32(R0, IPV4_DEST_ADDR_OFFSET)
+ gen.addLoad32intoR0(IPV4_DEST_ADDR_OFFSET)
gen.addJumpIfR0NotEquals(IPV4_BROADCAST_ADDRESS.toLong(), endOfDhcpFilter)
// Check it's UDP.
gen.addLoad8intoR0(IPV4_PROTOCOL_OFFSET)
diff --git a/tests/unit/src/android/net/apf/ApfTest.java b/tests/unit/src/android/net/apf/ApfTest.java
index cd413be..0bc51fe 100644
--- a/tests/unit/src/android/net/apf/ApfTest.java
+++ b/tests/unit/src/android/net/apf/ApfTest.java
@@ -551,7 +551,7 @@
// Test word load.
gen = new ApfV4Generator(APF_VERSION_2, mRamSize, mClampSize);
- gen.addLoad32(R0, 1);
+ gen.addLoad32intoR0(1);
gen.addJumpIfR0Equals((45 << 24) | (67 << 16) | (89 << 8) | 12, DROP_LABEL);
assertDrop(gen, new byte[]{123,45,67,89,12,0,0,0,0,0,0,0,0,0,0}, 0);
@@ -2889,7 +2889,7 @@
gen.addJumpIfR0Equals(0x1, (short) -102);
gen.addLoadImmediate(R1, -40);
gen.addJumpIfR0NotEquals(0x2, (short) -498);
- gen.addLoad32(R0, 28);
+ gen.addLoad32intoR0(28);
gen.addLoadImmediate(R1, -116);
gen.addJumpIfR0Equals(0x0, (short) -504);
gen.addLoadImmediate(R0, 0);
@@ -2897,7 +2897,7 @@
gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), (short) -498);
gen.defineLabel((short) -102);
- gen.addLoad32(R0, 38);
+ gen.addLoad32intoR0(38);
gen.addLoadImmediate(R1, -64);
gen.addJumpIfR0Equals(0x0, (short) -504);
gen.addLoadImmediate(R1, -8);
@@ -2925,7 +2925,7 @@
gen.addLoadImmediate(R1, -84);
gen.addJumpIfR0Equals(0xe0, (short) -504);
gen.addLoadImmediate(R1, -76);
- gen.addLoad32(R0, 30);
+ gen.addLoad32intoR0(30);
gen.addJumpIfR0Equals(0xffffffff, (short) -504);
gen.addLoadImmediate(R1, -24);
gen.addLoadImmediate(R0, 0);
@@ -2979,15 +2979,15 @@
gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("0000000000000000"), (short) -496);
gen.addLoadImmediate(R0, 78);
gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("19050000"), (short) -496);
- gen.addLoad32(R0, 82);
+ gen.addLoad32intoR0(82);
gen.addJumpIfR0LessThan(0x254, (short) -496);
gen.addLoadImmediate(R0, 86);
gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("2001486048600000000000000000646420014860486000000000000000000064"), (short) -496);
gen.addLoadImmediate(R0, 118);
gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("030440c0"), (short) -496);
- gen.addLoad32(R0, 122);
+ gen.addLoad32intoR0(122);
gen.addJumpIfR0LessThan(0x254, (short) -496);
- gen.addLoad32(R0, 126);
+ gen.addLoad32intoR0(126);
gen.addJumpIfR0LessThan(0x254, (short) -496);
gen.addLoadImmediate(R0, 130);
gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("00000000"), (short) -496);
@@ -3043,7 +3043,7 @@
gen.addJumpIfR0Equals(0x1, (short) -94);
gen.addLoadImmediate(R1, -40);
gen.addJumpIfR0NotEquals(0x2, (short) -277);
- gen.addLoad32(R0, 28);
+ gen.addLoad32intoR0(28);
gen.addLoadImmediate(R1, -116);
gen.addJumpIfR0Equals(0x0, (short) -283);
gen.addLoadImmediate(R0, 0);
@@ -3079,7 +3079,7 @@
gen.addLoadImmediate(R1, -84);
gen.addJumpIfR0Equals(0xe0, (short) -283);
gen.addLoadImmediate(R1, -76);
- gen.addLoad32(R0, 30);
+ gen.addLoad32intoR0(30);
gen.addJumpIfR0Equals(0xffffffff, (short) -283);
gen.addLoadImmediate(R1, -80);
gen.addJumpIfR0Equals(0xc0a801ff, (short) -283);
@@ -3161,7 +3161,7 @@
gen.addLoad16(R0, 20);
gen.addJumpIfR0Equals(0x1, (short) -100);
gen.addCountAndPassIfR0NotEquals(0x2, getCounterEnumFromOffset(-40));
- gen.addLoad32(R0, 28);
+ gen.addLoad32intoR0(28);
gen.addCountAndDropIfR0Equals(0x0, getCounterEnumFromOffset(-116));
gen.addLoadImmediate(R0, 0);
gen.addCountAndPassIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), getCounterEnumFromOffset(-44));
@@ -3191,7 +3191,7 @@
gen.addAnd(240);
gen.addCountAndDropIfR0Equals(0xe0, getCounterEnumFromOffset(-84));
gen.addLoadImmediate(R1, -76);
- gen.addLoad32(R0, 30);
+ gen.addLoad32intoR0(30);
gen.addJumpIfR0Equals(0xffffffff, gen.mCountAndDropLabel);
gen.addCountAndDropIfR0Equals(0xc0a801ff, getCounterEnumFromOffset(-80));
gen.addLoad8intoR0(23);
@@ -3276,7 +3276,7 @@
gen.addLoad16(R0, 20);
gen.addJumpIfR0Equals(0x1, (short) -104);
gen.addCountAndDropIfR0NotEquals(0x2, getCounterEnumFromOffset(-156));
- gen.addLoad32(R0, 28);
+ gen.addLoad32intoR0(28);
gen.addCountAndDropIfR0Equals(0x0, getCounterEnumFromOffset(-128));
gen.addLoadImmediate(R0, 0);
gen.addCountAndPassIfBytesAtR0NotEqual(hexStringToByteArray("ffffffffffff"), getCounterEnumFromOffset(-56));
@@ -3306,7 +3306,7 @@
gen.addAnd(240);
gen.addCountAndDropIfR0Equals(0xe0, getCounterEnumFromOffset(-96));
gen.addLoadImmediate(R1, -88);
- gen.addLoad32(R0, 30);
+ gen.addLoad32intoR0(30);
gen.addJumpIfR0Equals(0xffffffff, gen.mCountAndDropLabel);
gen.addCountAndDropIfR0Equals(0xc0a801ff, getCounterEnumFromOffset(-92));
gen.addLoad8intoR0(23);
@@ -3370,19 +3370,19 @@
gen.defineLabel((short) -421);
gen.addLoadImmediate(R0, 62);
gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("0000000000000000010128c68e23672c05010000000005dc030440c0"), (short) -574);
- gen.addLoad32(R0, 90);
+ gen.addLoad32intoR0(90);
gen.addJumpIfR0Equals(0x0, (short) -574);
gen.addJumpIfR0LessThan(0xb4, (short) -480);
gen.addJumpIfR0LessThan(0x55555555, (short) -574);
gen.addJumpIfR0GreaterThan(0xffffffffL, (short) -574);
gen.defineLabel((short) -480);
- gen.addLoad32(R0, 94);
+ gen.addLoad32intoR0(94);
gen.addJumpIfR0LessThan(0x55555555, (short) -574);
gen.addJumpIfR0GreaterThan(0xffffffffL, (short) -574);
gen.addLoadImmediate(R0, 98);
gen.addJumpIfBytesAtR0NotEqual(hexStringToByteArray("000000002401fa000480f000000000000000000019030000"), (short) -574);
- gen.addLoad32(R0, 122);
+ gen.addLoad32intoR0(122);
gen.addJumpIfR0Equals(0x0, (short) -574);
gen.addJumpIfR0LessThan(0x78, (short) -547);
gen.addJumpIfR0LessThan(0x91e, (short) -574);
