Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
f6ace15f
Commit
f6ace15f
authored
8 years ago
by
davidcunado-arm
Committed by
GitHub
8 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #689 from yatharth-arm/yk/plat_report_expn
Remove looping around `plat_report_exception`
parents
9115b867
5bbc451e
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
v1.5
v1.5-rc3
v1.5-rc2
v1.5-rc1
v1.5-rc0
v1.4
v1.4-rc0
v1.3
v1.3_rc2
v1.3_rc1
v1.3-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bl1/aarch64/bl1_exceptions.S
+16
-17
bl1/aarch64/bl1_exceptions.S
common/aarch64/early_exceptions.S
+16
-16
common/aarch64/early_exceptions.S
with
32 additions
and
33 deletions
+32
-33
bl1/aarch64/bl1_exceptions.S
View file @
f6ace15f
...
...
@@ -49,25 +49,25 @@ vector_base bl1_exceptions
vector_entry
SynchronousExceptionSP0
mov
x0
,
#
SYNC_EXCEPTION_SP_EL0
bl
plat_report_exception
b
SynchronousExceptionSP0
b
l
plat_panic_handler
check_vector_size
SynchronousExceptionSP0
vector_entry
IrqSP0
mov
x0
,
#
IRQ_SP_EL0
bl
plat_report_exception
b
IrqSP0
b
l
plat_panic_handler
check_vector_size
IrqSP0
vector_entry
FiqSP0
mov
x0
,
#
FIQ_SP_EL0
bl
plat_report_exception
b
FiqSP0
b
l
plat_panic_handler
check_vector_size
FiqSP0
vector_entry
SErrorSP0
mov
x0
,
#
SERROR_SP_EL0
bl
plat_report_exception
b
SErrorSP0
b
l
plat_panic_handler
check_vector_size
SErrorSP0
/
*
-----------------------------------------------------
...
...
@@ -77,25 +77,25 @@ vector_entry SErrorSP0
vector_entry
SynchronousExceptionSPx
mov
x0
,
#
SYNC_EXCEPTION_SP_ELX
bl
plat_report_exception
b
SynchronousExceptionSPx
b
l
plat_panic_handler
check_vector_size
SynchronousExceptionSPx
vector_entry
IrqSPx
mov
x0
,
#
IRQ_SP_ELX
bl
plat_report_exception
b
IrqSPx
b
l
plat_panic_handler
check_vector_size
IrqSPx
vector_entry
FiqSPx
mov
x0
,
#
FIQ_SP_ELX
bl
plat_report_exception
b
FiqSPx
b
l
plat_panic_handler
check_vector_size
FiqSPx
vector_entry
SErrorSPx
mov
x0
,
#
SERROR_SP_ELX
bl
plat_report_exception
b
SErrorSPx
b
l
plat_panic_handler
check_vector_size
SErrorSPx
/
*
-----------------------------------------------------
...
...
@@ -120,19 +120,19 @@ vector_entry SynchronousExceptionA64
vector_entry
IrqA64
mov
x0
,
#
IRQ_AARCH64
bl
plat_report_exception
b
IrqA64
b
l
plat_panic_handler
check_vector_size
IrqA64
vector_entry
FiqA64
mov
x0
,
#
FIQ_AARCH64
bl
plat_report_exception
b
FiqA64
b
l
plat_panic_handler
check_vector_size
FiqA64
vector_entry
SErrorA64
mov
x0
,
#
SERROR_AARCH64
bl
plat_report_exception
b
SErrorA64
b
l
plat_panic_handler
check_vector_size
SErrorA64
/
*
-----------------------------------------------------
...
...
@@ -142,25 +142,25 @@ vector_entry SErrorA64
vector_entry
SynchronousExceptionA32
mov
x0
,
#
SYNC_EXCEPTION_AARCH32
bl
plat_report_exception
b
SynchronousExceptionA32
b
l
plat_panic_handler
check_vector_size
SynchronousExceptionA32
vector_entry
IrqA32
mov
x0
,
#
IRQ_AARCH32
bl
plat_report_exception
b
IrqA32
b
l
plat_panic_handler
check_vector_size
IrqA32
vector_entry
FiqA32
mov
x0
,
#
FIQ_AARCH32
bl
plat_report_exception
b
FiqA32
b
l
plat_panic_handler
check_vector_size
FiqA32
vector_entry
SErrorA32
mov
x0
,
#
SERROR_AARCH32
bl
plat_report_exception
b
SErrorA32
b
l
plat_panic_handler
check_vector_size
SErrorA32
...
...
@@ -231,8 +231,7 @@ endfunc smc_handler64
unexpected_sync_exception
:
mov
x0
,
#
SYNC_EXCEPTION_AARCH64
bl
plat_report_exception
wfi
b
unexpected_sync_exception
bl
plat_panic_handler
/
*
-----------------------------------------------------
*
Save
Secure
/
Normal
world
context
and
jump
to
...
...
This diff is collapsed.
Click to expand it.
common/aarch64/early_exceptions.S
View file @
f6ace15f
...
...
@@ -47,25 +47,25 @@ vector_base early_exceptions
vector_entry
SynchronousExceptionSP0
mov
x0
,
#
SYNC_EXCEPTION_SP_EL0
bl
plat_report_exception
b
SynchronousExceptionSP0
b
l
plat_panic_handler
check_vector_size
SynchronousExceptionSP0
vector_entry
IrqSP0
mov
x0
,
#
IRQ_SP_EL0
bl
plat_report_exception
b
IrqSP0
b
l
plat_panic_handler
check_vector_size
IrqSP0
vector_entry
FiqSP0
mov
x0
,
#
FIQ_SP_EL0
bl
plat_report_exception
b
FiqSP0
b
l
plat_panic_handler
check_vector_size
FiqSP0
vector_entry
SErrorSP0
mov
x0
,
#
SERROR_SP_EL0
bl
plat_report_exception
b
SErrorSP0
b
l
plat_panic_handler
check_vector_size
SErrorSP0
/
*
-----------------------------------------------------
...
...
@@ -75,25 +75,25 @@ vector_entry SErrorSP0
vector_entry
SynchronousExceptionSPx
mov
x0
,
#
SYNC_EXCEPTION_SP_ELX
bl
plat_report_exception
b
SynchronousExceptionSPx
b
l
plat_panic_handler
check_vector_size
SynchronousExceptionSPx
vector_entry
IrqSPx
mov
x0
,
#
IRQ_SP_ELX
bl
plat_report_exception
b
IrqSPx
b
l
plat_panic_handler
check_vector_size
IrqSPx
vector_entry
FiqSPx
mov
x0
,
#
FIQ_SP_ELX
bl
plat_report_exception
b
FiqSPx
b
l
plat_panic_handler
check_vector_size
FiqSPx
vector_entry
SErrorSPx
mov
x0
,
#
SERROR_SP_ELX
bl
plat_report_exception
b
SErrorSPx
b
l
plat_panic_handler
check_vector_size
SErrorSPx
/
*
-----------------------------------------------------
...
...
@@ -103,25 +103,25 @@ vector_entry SErrorSPx
vector_entry
SynchronousExceptionA64
mov
x0
,
#
SYNC_EXCEPTION_AARCH64
bl
plat_report_exception
b
SynchronousExceptionA64
b
l
plat_panic_handler
check_vector_size
SynchronousExceptionA64
vector_entry
IrqA64
mov
x0
,
#
IRQ_AARCH64
bl
plat_report_exception
b
IrqA64
b
l
plat_panic_handler
check_vector_size
IrqA64
vector_entry
FiqA64
mov
x0
,
#
FIQ_AARCH64
bl
plat_report_exception
b
FiqA64
b
l
plat_panic_handler
check_vector_size
FiqA64
vector_entry
SErrorA64
mov
x0
,
#
SERROR_AARCH64
bl
plat_report_exception
b
SErrorA64
b
l
plat_panic_handler
check_vector_size
SErrorA64
/
*
-----------------------------------------------------
...
...
@@ -131,23 +131,23 @@ vector_entry SErrorA64
vector_entry
SynchronousExceptionA32
mov
x0
,
#
SYNC_EXCEPTION_AARCH32
bl
plat_report_exception
b
SynchronousExceptionA32
b
l
plat_panic_handler
check_vector_size
SynchronousExceptionA32
vector_entry
IrqA32
mov
x0
,
#
IRQ_AARCH32
bl
plat_report_exception
b
IrqA32
b
l
plat_panic_handler
check_vector_size
IrqA32
vector_entry
FiqA32
mov
x0
,
#
FIQ_AARCH32
bl
plat_report_exception
b
FiqA32
b
l
plat_panic_handler
check_vector_size
FiqA32
vector_entry
SErrorA32
mov
x0
,
#
SERROR_AARCH32
bl
plat_report_exception
b
SErrorA32
b
l
plat_panic_handler
check_vector_size
SErrorA32
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help