Introduced conditional calls in instruction definition rules.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@459 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 31 insertions, 1 deletions

diff --git a/src/arch/arm/v7/opdefs/ldr_A8864.d b/src/arch/arm/v7/opdefs/ldr_A8864.d
index acb6f94..3fbc0e3 100644
--- a/src/arch/arm/v7/opdefs/ldr_A8864.d
+++ b/src/arch/arm/v7/opdefs/ldr_A8864.d
@@ -37,6 +37,13 @@
 
     }
 
+    @hooks {
+
+        link = handle_links_with_instruction_ldr_literal_from_thumb
+        post = post_process_ldr_instructions
+
+    }
+
 }
 
 @encoding(T2) {
@@ -53,9 +60,17 @@
 
     }
 
+    @hooks {
+
+        link = handle_links_with_instruction_ldr_literal_from_thumb
+        post = post_process_ldr_instructions
+
+    }
+
     @rules {
 
         //if t == 15 && InITBlock() && !LastInITBlock() then UNPREDICTABLE;
+        if (Rt == '1111'); call DefineAsReturn(1)
 
     }
 
@@ -65,14 +80,29 @@
 
     @word cond(4) 0 1 0 1 U(1) 0 0 1 1 1 1 1 Rt(4) imm12(12)
 
-    @syntax <Rgt> <label>
+    @syntax {c} <Rgt> <label>
 
     @conv {
 
+        c = Condition(cond)
         Rgt = Register(Rt)
         imm32 = ZeroExtend(imm12, 12, 32)
         label = MakeAccessOffset(U, imm32)
 
     }
 
+    @hooks {
+
+        link = handle_links_with_instruction_ldr_literal_from_arm
+        post = post_process_ldr_instructions
+
+    }
+
+    @rules {
+
+        //if t == 15 && InITBlock() && !LastInITBlock() then UNPREDICTABLE;
+        if (Rt == '1111'); call DefineAsReturn(1)
+
+    }
+
 }