commit 8735eaf5a9f6dc6969aa2d81da97e62ef94d07fc
author Maciej Żenczykowski <maze@google.com> Wed May 01 05:12:48 2024 +0000
committer Maciej Żenczykowski <maze@google.com> Wed May 01 05:13:03 2024 +0000
tree e4e2d9f274cdeecea4301fad629a7e6582af26e6
parent 4fcc23591f8ffda5b3e5f83e53be40687361875b

ApfV4Generator: eliminate maybeAddLoadR1CounterOffset

just use maybeAddLoadCounterOffset(R1, ...)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If67f50add938ca20569555de1a0c877c3f3b87c2

src/android/net/apf/ApfV4Generator.java

diff --git a/src/android/net/apf/ApfV4Generator.java b/src/android/net/apf/ApfV4Generator.java
index bf9a368..ca98a8a 100644
--- a/src/android/net/apf/ApfV4Generator.java
+++ b/src/android/net/apf/ApfV4Generator.java
@@ -88,7 +88,7 @@
     @Override
     public ApfV4Generator addCountAndPass(ApfCounterTracker.Counter counter) {
         checkPassCounterRange(counter);
-        return maybeAddLoadR1CounterOffset(counter).addJump(mCountAndPassLabel);
+        return maybeAddLoadCounterOffset(R1, counter).addJump(mCountAndPassLabel);
     }
 
     /**
@@ -102,31 +102,31 @@
     @Override
     public ApfV4Generator addCountAndDrop(ApfCounterTracker.Counter counter) {
         checkDropCounterRange(counter);
-        return maybeAddLoadR1CounterOffset(counter).addJump(mCountAndDropLabel);
+        return maybeAddLoadCounterOffset(R1, counter).addJump(mCountAndDropLabel);
     }
 
     @Override
     public ApfV4Generator addCountAndDropIfR0Equals(long val, ApfCounterTracker.Counter cnt) {
         checkDropCounterRange(cnt);
-        return maybeAddLoadR1CounterOffset(cnt).addJumpIfR0Equals(val, mCountAndDropLabel);
+        return maybeAddLoadCounterOffset(R1, cnt).addJumpIfR0Equals(val, mCountAndDropLabel);
     }
 
     @Override
     public ApfV4Generator addCountAndPassIfR0Equals(long val, ApfCounterTracker.Counter cnt) {
         checkPassCounterRange(cnt);
-        return maybeAddLoadR1CounterOffset(cnt).addJumpIfR0Equals(val, mCountAndPassLabel);
+        return maybeAddLoadCounterOffset(R1, cnt).addJumpIfR0Equals(val, mCountAndPassLabel);
     }
 
     @Override
     public ApfV4Generator addCountAndDropIfR0NotEquals(long val, ApfCounterTracker.Counter cnt) {
         checkDropCounterRange(cnt);
-        return maybeAddLoadR1CounterOffset(cnt).addJumpIfR0NotEquals(val, mCountAndDropLabel);
+        return maybeAddLoadCounterOffset(R1, cnt).addJumpIfR0NotEquals(val, mCountAndDropLabel);
     }
 
     @Override
     public ApfV4Generator addCountAndPassIfR0NotEquals(long val, ApfCounterTracker.Counter cnt) {
         checkPassCounterRange(cnt);
-        return maybeAddLoadR1CounterOffset(cnt).addJumpIfR0NotEquals(val, mCountAndPassLabel);
+        return maybeAddLoadCounterOffset(R1, cnt).addJumpIfR0NotEquals(val, mCountAndPassLabel);
     }
 
     @Override
@@ -135,7 +135,7 @@
         if (val <= 0) {
             throw new IllegalArgumentException("val must > 0, current val: " + val);
         }
-        return maybeAddLoadR1CounterOffset(cnt).addJumpIfR0LessThan(val, mCountAndDropLabel);
+        return maybeAddLoadCounterOffset(R1, cnt).addJumpIfR0LessThan(val, mCountAndDropLabel);
     }
 
     @Override
@@ -144,14 +144,14 @@
         if (val <= 0) {
             throw new IllegalArgumentException("val must > 0, current val: " + val);
         }
-        return maybeAddLoadR1CounterOffset(cnt).addJumpIfR0LessThan(val, mCountAndPassLabel);
+        return maybeAddLoadCounterOffset(R1, cnt).addJumpIfR0LessThan(val, mCountAndPassLabel);
     }
 
     @Override
     public ApfV4Generator addCountAndDropIfBytesAtR0NotEqual(byte[] bytes,
             ApfCounterTracker.Counter cnt) throws IllegalInstructionException {
         checkDropCounterRange(cnt);
-        return maybeAddLoadR1CounterOffset(cnt).addJumpIfBytesAtR0NotEqual(bytes,
+        return maybeAddLoadCounterOffset(R1, cnt).addJumpIfBytesAtR0NotEqual(bytes,
                 mCountAndDropLabel);
     }
 
@@ -159,7 +159,7 @@
     public ApfV4Generator addCountAndPassIfBytesAtR0NotEqual(byte[] bytes,
             ApfCounterTracker.Counter cnt) throws IllegalInstructionException {
         checkPassCounterRange(cnt);
-        return maybeAddLoadR1CounterOffset(cnt).addJumpIfBytesAtR0NotEqual(bytes,
+        return maybeAddLoadCounterOffset(R1, cnt).addJumpIfBytesAtR0NotEqual(bytes,
                 mCountAndPassLabel);
     }
 
@@ -234,8 +234,4 @@
         if (mVersion < 4) return self();
         return addLoadImmediate(reg, cnt.offset());
     }
-
-    private ApfV4Generator maybeAddLoadR1CounterOffset(ApfCounterTracker.Counter counter) {
-        return maybeAddLoadCounterOffset(R1, counter);
-    }
 }