commit fb37b5d8438252728469290fa35a779817faea00
author Pierre Langlois <pierre.langlois@arm.com> Wed Jan 18 17:19:45 2017 +0000
committer Pierre Langlois <pierre.langlois@arm.com> Mon Jan 23 10:35:13 2017 +0000
tree 0bebdbee5ebac03e031665ef12cea1f7e858b1e0
parent 0cec43d2696e745b8c031930dec336db5c58ac52

Add tests for pool blocking in nested ExactAssemblyScope

On top of adding tests, this patch adds a new top-level
MacroAssembler::ArePoolsBlocked() API method. This is useful for testing
that the pools are actually blocked or not, and that nesting does not
accidentally unblock them.

Change-Id: If3845c6686ef45ddf1d28b8876ffd349731cdd9d

src/aarch32/macro-assembler-aarch32.h

diff --git a/src/aarch32/macro-assembler-aarch32.h b/src/aarch32/macro-assembler-aarch32.h
index b4aa8c1..5957d2a 100644
--- a/src/aarch32/macro-assembler-aarch32.h
+++ b/src/aarch32/macro-assembler-aarch32.h
@@ -124,12 +124,15 @@
   }
 
   virtual void BlockPools() VIXL_OVERRIDE {
-    literal_pool_manager_.Block();
-    veneer_pool_manager_.Block();
+    BlockLiteralPool();
+    BlockVeneerPool();
   }
   virtual void ReleasePools() VIXL_OVERRIDE {
-    literal_pool_manager_.Release();
-    veneer_pool_manager_.Release();
+    ReleaseLiteralPool();
+    ReleaseVeneerPool();
+  }
+  virtual bool ArePoolsBlocked() const VIXL_OVERRIDE {
+    return IsLiteralPoolBlocked() && IsVeneerPoolBlocked();
   }
   virtual void EnsureEmitPoolsFor(size_t size) VIXL_OVERRIDE {
     // TODO: Optimise this. It also checks that there is space in the buffer,
@@ -413,6 +416,15 @@
   void PerformEnsureEmit(Label::Offset target, uint32_t extra_size);
 
  protected:
+  void BlockLiteralPool() { literal_pool_manager_.Block(); }
+  void ReleaseLiteralPool() { literal_pool_manager_.Release(); }
+  bool IsLiteralPoolBlocked() const {
+    return literal_pool_manager_.IsBlocked();
+  }
+  void BlockVeneerPool() { veneer_pool_manager_.Block(); }
+  void ReleaseVeneerPool() { veneer_pool_manager_.Release(); }
+  bool IsVeneerPoolBlocked() const { return veneer_pool_manager_.IsBlocked(); }
+
   void HandleOutOfBoundsImmediate(Condition cond, Register tmp, uint32_t imm);
   void PadToMinimumBranchRange(Label* label);
 
@@ -435,7 +447,7 @@
       instr_callback.emit(this, c, literal);
     }
     if (!literal->IsManuallyPlaced() && !literal->IsBound() &&
-        !literal_pool_manager_.IsBlocked()) {
+        !IsLiteralPoolBlocked()) {
       if (WasInsertedTooFar(literal)) {
         // The instruction's data is too far: revert the emission
         GetBuffer()->Rewind(cursor);
@@ -720,7 +732,7 @@
   // delete'd.
   void EmitLiteralPool(LiteralPool* const literal_pool, EmitOption option);
   void EmitLiteralPool(EmitOption option = kBranchRequired) {
-    VIXL_ASSERT(!literal_pool_manager_.IsBlocked());
+    VIXL_ASSERT(!IsLiteralPoolBlocked());
     EmitLiteralPool(literal_pool_manager_.GetLiteralPool(), option);
     literal_pool_manager_.ResetCheckpoint();
     ComputeCheckpoint();