diff options
| author | danh-arm <dan.handley@arm.com> | 2016-12-12 14:29:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 14:29:01 +0000 |
| commit | 1b5fa6ef1082ffb9979df4aad91525eda571eb50 (patch) | |
| tree | 082595c467672752cadc9228f43ef1c78f369e4e /common | |
| parent | 919ad05ecb8fab23f91a37783dc5f246847c7bd2 (diff) | |
| parent | a806dad58c4cf752238d7bbffbc9a1ce17f63cea (diff) | |
Merge pull request #774 from jeenu-arm/no-return-macro
Define and use no_ret macro where no return is expected
Diffstat (limited to 'common')
| -rw-r--r-- | common/aarch32/debug.S | 4 | ||||
| -rw-r--r-- | common/aarch64/debug.S | 2 | ||||
| -rw-r--r-- | common/aarch64/early_exceptions.S | 32 |
3 files changed, 19 insertions, 19 deletions
diff --git a/common/aarch32/debug.S b/common/aarch32/debug.S index 6be69512..cfce7ed9 100644 --- a/common/aarch32/debug.S +++ b/common/aarch32/debug.S @@ -38,7 +38,7 @@ * The common implementation of do_panic for all BL stages ***********************************************************/ func do_panic - b plat_panic_handler + no_ret plat_panic_handler endfunc do_panic /*********************************************************** @@ -50,5 +50,5 @@ func report_exception mrs r0, cpsr and r0, #MODE32_MASK bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler endfunc report_exception diff --git a/common/aarch64/debug.S b/common/aarch64/debug.S index d3538792..9dd53ca9 100644 --- a/common/aarch64/debug.S +++ b/common/aarch64/debug.S @@ -191,5 +191,5 @@ _panic_handler: /* Pass to plat_panic_handler the address from where el3_panic was * called, not the address of the call from el3_panic. */ mov x30,x6 - b plat_panic_handler + no_ret plat_panic_handler endfunc do_panic diff --git a/common/aarch64/early_exceptions.S b/common/aarch64/early_exceptions.S index ad5b4d86..be214596 100644 --- a/common/aarch64/early_exceptions.S +++ b/common/aarch64/early_exceptions.S @@ -47,25 +47,25 @@ vector_base early_exceptions vector_entry SynchronousExceptionSP0 mov x0, #SYNC_EXCEPTION_SP_EL0 bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size SynchronousExceptionSP0 vector_entry IrqSP0 mov x0, #IRQ_SP_EL0 bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size IrqSP0 vector_entry FiqSP0 mov x0, #FIQ_SP_EL0 bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size FiqSP0 vector_entry SErrorSP0 mov x0, #SERROR_SP_EL0 bl plat_report_exception - bl plat_panic_handler + no_ret 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 - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size SynchronousExceptionSPx vector_entry IrqSPx mov x0, #IRQ_SP_ELX bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size IrqSPx vector_entry FiqSPx mov x0, #FIQ_SP_ELX bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size FiqSPx vector_entry SErrorSPx mov x0, #SERROR_SP_ELX bl plat_report_exception - bl plat_panic_handler + no_ret 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 - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size SynchronousExceptionA64 vector_entry IrqA64 mov x0, #IRQ_AARCH64 bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size IrqA64 vector_entry FiqA64 mov x0, #FIQ_AARCH64 bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size FiqA64 vector_entry SErrorA64 mov x0, #SERROR_AARCH64 bl plat_report_exception - bl plat_panic_handler + no_ret 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 - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size SynchronousExceptionA32 vector_entry IrqA32 mov x0, #IRQ_AARCH32 bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size IrqA32 vector_entry FiqA32 mov x0, #FIQ_AARCH32 bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size FiqA32 vector_entry SErrorA32 mov x0, #SERROR_AARCH32 bl plat_report_exception - bl plat_panic_handler + no_ret plat_panic_handler check_vector_size SErrorA32 |