Commit fef6427b authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King

[ARM PATCH] 2106/1: Remove the "write" assumption for Jazelle in the early_abort handler

Patch from Catalin Marinas

On ARM926EJ-S, the "always assume write" for Jazelle data aborts
causes Java code exit with segmentation fault every time it tries
to access a read-only page. This patch puts some restrictions on what 
can be done in the Jazelle state but it allows it to run.

Signed-off-by: Catalin Marinas 
parent 21c08132
...@@ -23,7 +23,6 @@ ENTRY(v5tj_early_abort) ...@@ -23,7 +23,6 @@ ENTRY(v5tj_early_abort)
mrc p15, 0, r0, c6, c0, 0 @ get FAR mrc p15, 0, r0, c6, c0, 0 @ get FAR
bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR
tst r3, #PSR_J_BIT @ Java? tst r3, #PSR_J_BIT @ Java?
orrne r1, r1, #1 << 11 @ always assume write
movne pc, lr movne pc, lr
tst r3, #PSR_T_BIT @ Thumb? tst r3, #PSR_T_BIT @ Thumb?
ldrneh r3, [r2] @ read aborted thumb instruction ldrneh r3, [r2] @ read aborted thumb instruction
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment