Merge pull request #290 from soby-mathew/sm/AEM_crash_report_fix
Fix recursive crash prints on FVP AEM model
diff --git a/lib/cpus/aarch64/aem_generic.S b/lib/cpus/aarch64/aem_generic.S
index ee53058..0ab5253 100644
--- a/lib/cpus/aarch64/aem_generic.S
+++ b/lib/cpus/aarch64/aem_generic.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2015, ARM Limited and Contributors. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -79,8 +79,12 @@
* reported.
* ---------------------------------------------
*/
+.section .rodata.aem_generic_regs, "aS"
+aem_generic_regs: /* The ascii list of register names to be reported */
+ .asciz "" /* no registers to report */
+
func aem_generic_cpu_reg_dump
- mov x6, #0 /* no registers to report */
+ adr x6, aem_generic_regs
ret
endfunc aem_generic_cpu_reg_dump