commit 9ff7053024b9e0ab35212a20c08fc4ed089cab8a parent 7aeec08fd57fedba8fa4db3c64d54c38ad13687a Author: Dimitris Papastamos <dimitris.papastamos@arm.com> Date: Wed, 7 Nov 2018 13:26:15 +0000 [rcode] Move trapframe out of rmucmd This is a preparation step for integrating the debug interpreter in the bare metal target. Change-Id: I5b1f83d17d2ad3561787c182794991689b1cb1fc Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com> Diffstat:
72 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/include/rcode.h b/include/rcode.h @@ -86,6 +86,7 @@ struct bssmap { void *uartbase; const char *errstr; jmp_buf dbgrecover; + struct trapframe *fp; Rmucmd *cmd; unsigned char enable; /* System realm enablement */ @@ -125,7 +126,6 @@ struct trapframe { struct rmucmd { unsigned class, func; - struct trapframe *fp; }; static inline struct bssmap * volatile diff --git a/src/libhdl/hdl_RMU_Crypto_Random.c b/src/libhdl/hdl_RMU_Crypto_Random.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Crypto_Random(Rmucmd *cmd) +hdl_RMU_Crypto_Random(void) { panic("hdl_RMU_Crypto_Random"); } diff --git a/src/libhdl/hdl_RMU_Granule_Add.c b/src/libhdl/hdl_RMU_Granule_Add.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Add(Rmucmd *cmd) +hdl_RMU_Granule_Add(void) { panic("hdl_RMU_Granule_Add"); } diff --git a/src/libhdl/hdl_RMU_Granule_AddInit.c b/src/libhdl/hdl_RMU_Granule_AddInit.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_AddInit(Rmucmd *cmd) +hdl_RMU_Granule_AddInit(void) { panic("hdl_RMU_Granule_AddInit"); } diff --git a/src/libhdl/hdl_RMU_Granule_Claim.c b/src/libhdl/hdl_RMU_Granule_Claim.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Claim(Rmucmd *cmd) +hdl_RMU_Granule_Claim(void) { panic("hdl_RMU_Granule_Claim"); } diff --git a/src/libhdl/hdl_RMU_Granule_Clean.c b/src/libhdl/hdl_RMU_Granule_Clean.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Clean(Rmucmd *cmd) +hdl_RMU_Granule_Clean(void) { panic("hdl_RMU_Granule_Clean"); } diff --git a/src/libhdl/hdl_RMU_Granule_Detail.c b/src/libhdl/hdl_RMU_Granule_Detail.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Detail(Rmucmd *cmd) +hdl_RMU_Granule_Detail(void) { panic("hdl_RMU_Granule_Detail"); } diff --git a/src/libhdl/hdl_RMU_Granule_Export.c b/src/libhdl/hdl_RMU_Granule_Export.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Export(Rmucmd *cmd) +hdl_RMU_Granule_Export(void) { panic("hdl_RMU_Granule_Export"); } diff --git a/src/libhdl/hdl_RMU_Granule_ExportInit.c b/src/libhdl/hdl_RMU_Granule_ExportInit.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_ExportInit(Rmucmd *cmd) +hdl_RMU_Granule_ExportInit(void) { panic("hdl_RMU_Granule_ExportInit"); } diff --git a/src/libhdl/hdl_RMU_Granule_Fuse.c b/src/libhdl/hdl_RMU_Granule_Fuse.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Fuse(Rmucmd *cmd) +hdl_RMU_Granule_Fuse(void) { panic("hdl_RMU_Granule_Fuse"); } diff --git a/src/libhdl/hdl_RMU_Granule_Import.c b/src/libhdl/hdl_RMU_Granule_Import.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Import(Rmucmd *cmd) +hdl_RMU_Granule_Import(void) { panic("hdl_RMU_Granule_Import"); } diff --git a/src/libhdl/hdl_RMU_Granule_ImportInit.c b/src/libhdl/hdl_RMU_Granule_ImportInit.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_ImportInit(Rmucmd *cmd) +hdl_RMU_Granule_ImportInit(void) { panic("hdl_RMU_Granule_ImportInit"); } diff --git a/src/libhdl/hdl_RMU_Granule_Info.c b/src/libhdl/hdl_RMU_Granule_Info.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Info(Rmucmd *cmd) +hdl_RMU_Granule_Info(void) { panic("hdl_RMU_Granule_Info"); } diff --git a/src/libhdl/hdl_RMU_Granule_Invalidate.c b/src/libhdl/hdl_RMU_Granule_Invalidate.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Invalidate(Rmucmd *cmd) +hdl_RMU_Granule_Invalidate(void) { panic("hdl_RMU_Granule_Invalidate"); } diff --git a/src/libhdl/hdl_RMU_Granule_Reclaim.c b/src/libhdl/hdl_RMU_Granule_Reclaim.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Reclaim(Rmucmd *cmd) +hdl_RMU_Granule_Reclaim(void) { panic("hdl_RMU_Granule_Reclaim"); } diff --git a/src/libhdl/hdl_RMU_Granule_Release.c b/src/libhdl/hdl_RMU_Granule_Release.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Release(Rmucmd *cmd) +hdl_RMU_Granule_Release(void) { panic("hdl_RMU_Granule_Release"); } diff --git a/src/libhdl/hdl_RMU_Granule_SetGlobalVisibility.c b/src/libhdl/hdl_RMU_Granule_SetGlobalVisibility.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_SetGlobalVisibility(Rmucmd *cmd) +hdl_RMU_Granule_SetGlobalVisibility(void) { panic("hdl_RMU_Granule_SetGlobalVisibility"); } diff --git a/src/libhdl/hdl_RMU_Granule_SetPermissions.c b/src/libhdl/hdl_RMU_Granule_SetPermissions.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_SetPermissions(Rmucmd *cmd) +hdl_RMU_Granule_SetPermissions(void) { panic("hdl_RMU_Granule_SetPermissions"); } diff --git a/src/libhdl/hdl_RMU_Granule_Shatter.c b/src/libhdl/hdl_RMU_Granule_Shatter.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Shatter(Rmucmd *cmd) +hdl_RMU_Granule_Shatter(void) { panic("hdl_RMU_Granule_Shatter"); } diff --git a/src/libhdl/hdl_RMU_Granule_Sync.c b/src/libhdl/hdl_RMU_Granule_Sync.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Granule_Sync(Rmucmd *cmd) +hdl_RMU_Granule_Sync(void) { panic("hdl_RMU_Granule_Sync"); } diff --git a/src/libhdl/hdl_RMU_Local_Load.c b/src/libhdl/hdl_RMU_Local_Load.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Local_Load(Rmucmd *cmd) +hdl_RMU_Local_Load(void) { panic("hdl_RMU_Local_Load"); } diff --git a/src/libhdl/hdl_RMU_Local_Status.c b/src/libhdl/hdl_RMU_Local_Status.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Local_Status(Rmucmd *cmd) +hdl_RMU_Local_Status(void) { panic("hdl_RMU_Local_Status"); } diff --git a/src/libhdl/hdl_RMU_Local_Validate.c b/src/libhdl/hdl_RMU_Local_Validate.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Local_Validate(Rmucmd *cmd) +hdl_RMU_Local_Validate(void) { panic("hdl_RMU_Local_Validate"); } diff --git a/src/libhdl/hdl_RMU_MDT_BufferSize.c b/src/libhdl/hdl_RMU_MDT_BufferSize.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_MDT_BufferSize(Rmucmd *cmd) +hdl_RMU_MDT_BufferSize(void) { panic("hdl_RMU_MDT_BufferSize"); } diff --git a/src/libhdl/hdl_RMU_MDT_Info.c b/src/libhdl/hdl_RMU_MDT_Info.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_MDT_Info(Rmucmd *cmd) +hdl_RMU_MDT_Info(void) { panic("hdl_RMU_MDT_Info"); } diff --git a/src/libhdl/hdl_RMU_MDT_Move.c b/src/libhdl/hdl_RMU_MDT_Move.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_MDT_Move(Rmucmd *cmd) +hdl_RMU_MDT_Move(void) { panic("hdl_RMU_MDT_Move"); } diff --git a/src/libhdl/hdl_RMU_MDT_ReadStorage.c b/src/libhdl/hdl_RMU_MDT_ReadStorage.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_MDT_ReadStorage(Rmucmd *cmd) +hdl_RMU_MDT_ReadStorage(void) { panic("hdl_RMU_MDT_ReadStorage"); } diff --git a/src/libhdl/hdl_RMU_MDT_Register.c b/src/libhdl/hdl_RMU_MDT_Register.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_MDT_Register(Rmucmd *cmd) +hdl_RMU_MDT_Register(void) { panic("hdl_RMU_MDT_Register"); } diff --git a/src/libhdl/hdl_RMU_MDT_Release.c b/src/libhdl/hdl_RMU_MDT_Release.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_MDT_Release(Rmucmd *cmd) +hdl_RMU_MDT_Release(void) { panic("hdl_RMU_MDT_Release"); } diff --git a/src/libhdl/hdl_RMU_MDT_WriteStorage.c b/src/libhdl/hdl_RMU_MDT_WriteStorage.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_MDT_WriteStorage(Rmucmd *cmd) +hdl_RMU_MDT_WriteStorage(void) { panic("hdl_RMU_MDT_WriteStorage"); } diff --git a/src/libhdl/hdl_RMU_REC_Prepare.c b/src/libhdl/hdl_RMU_REC_Prepare.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_Prepare(Rmucmd *cmd) +hdl_RMU_REC_Prepare(void) { panic("hdl_RMU_REC_Prepare"); } diff --git a/src/libhdl/hdl_RMU_REC_ReadGeneralPurposeRegister.c b/src/libhdl/hdl_RMU_REC_ReadGeneralPurposeRegister.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_ReadGeneralPurposeRegister(Rmucmd *cmd) +hdl_RMU_REC_ReadGeneralPurposeRegister(void) { panic("hdl_RMU_REC_ReadGeneralPurposeRegister"); } diff --git a/src/libhdl/hdl_RMU_REC_ReadSystemRegister.c b/src/libhdl/hdl_RMU_REC_ReadSystemRegister.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_ReadSystemRegister(Rmucmd *cmd) +hdl_RMU_REC_ReadSystemRegister(void) { panic("hdl_RMU_REC_ReadSystemRegister"); } diff --git a/src/libhdl/hdl_RMU_REC_ReadVectorRegister.c b/src/libhdl/hdl_RMU_REC_ReadVectorRegister.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_ReadVectorRegister(Rmucmd *cmd) +hdl_RMU_REC_ReadVectorRegister(void) { panic("hdl_RMU_REC_ReadVectorRegister"); } diff --git a/src/libhdl/hdl_RMU_REC_Register.c b/src/libhdl/hdl_RMU_REC_Register.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_Register(Rmucmd *cmd) +hdl_RMU_REC_Register(void) { panic("hdl_RMU_REC_Register"); } diff --git a/src/libhdl/hdl_RMU_REC_Release.c b/src/libhdl/hdl_RMU_REC_Release.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_Release(Rmucmd *cmd) +hdl_RMU_REC_Release(void) { panic("hdl_RMU_REC_Release"); } diff --git a/src/libhdl/hdl_RMU_REC_Size.c b/src/libhdl/hdl_RMU_REC_Size.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_Size(Rmucmd *cmd) +hdl_RMU_REC_Size(void) { panic("hdl_RMU_REC_Size"); } diff --git a/src/libhdl/hdl_RMU_REC_WriteGeneralPurposeRegister.c b/src/libhdl/hdl_RMU_REC_WriteGeneralPurposeRegister.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_WriteGeneralPurposeRegister(Rmucmd *cmd) +hdl_RMU_REC_WriteGeneralPurposeRegister(void) { panic("hdl_RMU_REC_WriteGeneralPurposeRegister"); } diff --git a/src/libhdl/hdl_RMU_REC_WriteSystemRegister.c b/src/libhdl/hdl_RMU_REC_WriteSystemRegister.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_WriteSystemRegister(Rmucmd *cmd) +hdl_RMU_REC_WriteSystemRegister(void) { panic("hdl_RMU_REC_WriteSystemRegister"); } diff --git a/src/libhdl/hdl_RMU_REC_WriteVectorRegister.c b/src/libhdl/hdl_RMU_REC_WriteVectorRegister.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_REC_WriteVectorRegister(Rmucmd *cmd) +hdl_RMU_REC_WriteVectorRegister(void) { panic("hdl_RMU_REC_WriteVectorRegister"); } diff --git a/src/libhdl/hdl_RMU_Realm_Activate.c b/src/libhdl/hdl_RMU_Realm_Activate.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_Activate(Rmucmd *cmd) +hdl_RMU_Realm_Activate(void) { panic("hdl_RMU_Realm_Activate"); } diff --git a/src/libhdl/hdl_RMU_Realm_AttestationReport.c b/src/libhdl/hdl_RMU_Realm_AttestationReport.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_AttestationReport(Rmucmd *cmd) +hdl_RMU_Realm_AttestationReport(void) { panic("hdl_RMU_Realm_AttestationReport"); } diff --git a/src/libhdl/hdl_RMU_Realm_AttestationReportInit.c b/src/libhdl/hdl_RMU_Realm_AttestationReportInit.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_AttestationReportInit(Rmucmd *cmd) +hdl_RMU_Realm_AttestationReportInit(void) { panic("hdl_RMU_Realm_AttestationReportInit"); } diff --git a/src/libhdl/hdl_RMU_Realm_AttestationReportSize.c b/src/libhdl/hdl_RMU_Realm_AttestationReportSize.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_AttestationReportSize(Rmucmd *cmd) +hdl_RMU_Realm_AttestationReportSize(void) { panic("hdl_RMU_Realm_AttestationReportSize"); } diff --git a/src/libhdl/hdl_RMU_Realm_CreateZeroMetadata.c b/src/libhdl/hdl_RMU_Realm_CreateZeroMetadata.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_CreateZeroMetadata(Rmucmd *cmd) +hdl_RMU_Realm_CreateZeroMetadata(void) { panic("hdl_RMU_Realm_CreateZeroMetadata"); } diff --git a/src/libhdl/hdl_RMU_Realm_DeriveBindingKey.c b/src/libhdl/hdl_RMU_Realm_DeriveBindingKey.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_DeriveBindingKey(Rmucmd *cmd) +hdl_RMU_Realm_DeriveBindingKey(void) { panic("hdl_RMU_Realm_DeriveBindingKey"); } diff --git a/src/libhdl/hdl_RMU_Realm_ExtendBindingKeySeedValue.c b/src/libhdl/hdl_RMU_Realm_ExtendBindingKeySeedValue.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_ExtendBindingKeySeedValue(Rmucmd *cmd) +hdl_RMU_Realm_ExtendBindingKeySeedValue(void) { panic("hdl_RMU_Realm_ExtendBindingKeySeedValue"); } diff --git a/src/libhdl/hdl_RMU_Realm_GetBindingKeySeedValue.c b/src/libhdl/hdl_RMU_Realm_GetBindingKeySeedValue.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_GetBindingKeySeedValue(Rmucmd *cmd) +hdl_RMU_Realm_GetBindingKeySeedValue(void) { panic("hdl_RMU_Realm_GetBindingKeySeedValue"); } diff --git a/src/libhdl/hdl_RMU_Realm_GetMetadata.c b/src/libhdl/hdl_RMU_Realm_GetMetadata.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_GetMetadata(Rmucmd *cmd) +hdl_RMU_Realm_GetMetadata(void) { panic("hdl_RMU_Realm_GetMetadata"); } diff --git a/src/libhdl/hdl_RMU_Realm_GetParameterInheritance.c b/src/libhdl/hdl_RMU_Realm_GetParameterInheritance.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_GetParameterInheritance(Rmucmd *cmd) +hdl_RMU_Realm_GetParameterInheritance(void) { panic("hdl_RMU_Realm_GetParameterInheritance"); } diff --git a/src/libhdl/hdl_RMU_Realm_GetParameterValue.c b/src/libhdl/hdl_RMU_Realm_GetParameterValue.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_GetParameterValue(Rmucmd *cmd) +hdl_RMU_Realm_GetParameterValue(void) { panic("hdl_RMU_Realm_GetParameterValue"); } diff --git a/src/libhdl/hdl_RMU_Realm_Info.c b/src/libhdl/hdl_RMU_Realm_Info.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_Info(Rmucmd *cmd) +hdl_RMU_Realm_Info(void) { panic("hdl_RMU_Realm_Info"); } diff --git a/src/libhdl/hdl_RMU_Realm_Initialize.c b/src/libhdl/hdl_RMU_Realm_Initialize.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_Initialize(Rmucmd *cmd) +hdl_RMU_Realm_Initialize(void) { panic("hdl_RMU_Realm_Initialize"); } diff --git a/src/libhdl/hdl_RMU_Realm_Invalidate.c b/src/libhdl/hdl_RMU_Realm_Invalidate.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_Invalidate(Rmucmd *cmd) +hdl_RMU_Realm_Invalidate(void) { panic("hdl_RMU_Realm_Invalidate"); } diff --git a/src/libhdl/hdl_RMU_Realm_InvalidateCurrent.c b/src/libhdl/hdl_RMU_Realm_InvalidateCurrent.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_InvalidateCurrent(Rmucmd *cmd) +hdl_RMU_Realm_InvalidateCurrent(void) { panic("hdl_RMU_Realm_InvalidateCurrent"); } diff --git a/src/libhdl/hdl_RMU_Realm_Populate.c b/src/libhdl/hdl_RMU_Realm_Populate.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_Populate(Rmucmd *cmd) +hdl_RMU_Realm_Populate(void) { panic("hdl_RMU_Realm_Populate"); } diff --git a/src/libhdl/hdl_RMU_Realm_Prepare.c b/src/libhdl/hdl_RMU_Realm_Prepare.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_Prepare(Rmucmd *cmd) +hdl_RMU_Realm_Prepare(void) { panic("hdl_RMU_Realm_Prepare"); } diff --git a/src/libhdl/hdl_RMU_Realm_ReadMemory.c b/src/libhdl/hdl_RMU_Realm_ReadMemory.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_ReadMemory(Rmucmd *cmd) +hdl_RMU_Realm_ReadMemory(void) { panic("hdl_RMU_Realm_ReadMemory"); } diff --git a/src/libhdl/hdl_RMU_Realm_Register.c b/src/libhdl/hdl_RMU_Realm_Register.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_Register(Rmucmd *cmd) +hdl_RMU_Realm_Register(void) { panic("hdl_RMU_Realm_Register"); } diff --git a/src/libhdl/hdl_RMU_Realm_Release.c b/src/libhdl/hdl_RMU_Realm_Release.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_Release(Rmucmd *cmd) +hdl_RMU_Realm_Release(void) { panic("hdl_RMU_Realm_Release"); } diff --git a/src/libhdl/hdl_RMU_Realm_SetBindingKeySeedLock.c b/src/libhdl/hdl_RMU_Realm_SetBindingKeySeedLock.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_SetBindingKeySeedLock(Rmucmd *cmd) +hdl_RMU_Realm_SetBindingKeySeedLock(void) { panic("hdl_RMU_Realm_SetBindingKeySeedLock"); } diff --git a/src/libhdl/hdl_RMU_Realm_SetCommandTrap.c b/src/libhdl/hdl_RMU_Realm_SetCommandTrap.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_SetCommandTrap(Rmucmd *cmd) +hdl_RMU_Realm_SetCommandTrap(void) { panic("hdl_RMU_Realm_SetCommandTrap"); } diff --git a/src/libhdl/hdl_RMU_Realm_SetMetadata.c b/src/libhdl/hdl_RMU_Realm_SetMetadata.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_SetMetadata(Rmucmd *cmd) +hdl_RMU_Realm_SetMetadata(void) { panic("hdl_RMU_Realm_SetMetadata"); } diff --git a/src/libhdl/hdl_RMU_Realm_SetParameterInheritance.c b/src/libhdl/hdl_RMU_Realm_SetParameterInheritance.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_SetParameterInheritance(Rmucmd *cmd) +hdl_RMU_Realm_SetParameterInheritance(void) { panic("hdl_RMU_Realm_SetParameterInheritance"); } diff --git a/src/libhdl/hdl_RMU_Realm_SetParameterValue.c b/src/libhdl/hdl_RMU_Realm_SetParameterValue.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_SetParameterValue(Rmucmd *cmd) +hdl_RMU_Realm_SetParameterValue(void) { panic("hdl_RMU_Realm_SetParameterValue"); } diff --git a/src/libhdl/hdl_RMU_Realm_WriteMemory.c b/src/libhdl/hdl_RMU_Realm_WriteMemory.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_Realm_WriteMemory(Rmucmd *cmd) +hdl_RMU_Realm_WriteMemory(void) { panic("hdl_RMU_Realm_WriteMemory"); } diff --git a/src/libhdl/hdl_RMU_System_Enable.c b/src/libhdl/hdl_RMU_System_Enable.c @@ -2,7 +2,7 @@ #include <rcode.h> void -hdl_RMU_System_Enable(Rmucmd *cmd) +hdl_RMU_System_Enable(void) { RMU_System_Enable(); } diff --git a/src/libhdl/hdl_RMU_System_InterfaceVersion.c b/src/libhdl/hdl_RMU_System_InterfaceVersion.c @@ -2,11 +2,11 @@ #include <rcode.h> void -hdl_RMU_System_InterfaceVersion(Rmucmd *cmd) +hdl_RMU_System_InterfaceVersion(void) { unsigned long maj, min; RMU_System_InterfaceVersion(&maj, &min); - cmd->fp->x1 = maj; - cmd->fp->x2 = min; + bss->fp->x1 = maj; + bss->fp->x2 = min; } diff --git a/src/libhdl/hdl_RMU_System_Status.c b/src/libhdl/hdl_RMU_System_Status.c @@ -2,10 +2,10 @@ #include <rcode.h> void -hdl_RMU_System_Status(Rmucmd *cmd) +hdl_RMU_System_Status(void) { int enabled; RMU_System_Status(&enabled); - cmd->fp->x1 = enabled; + bss->fp->x1 = enabled; } diff --git a/src/rmc.c b/src/rmc.c @@ -111,7 +111,7 @@ trap(struct trapframe *fp) cmd.class = fp->esr & 0xff; cmd.func = (fp->esr >> 8) & 0xff; - cmd.fp = fp; + bss->fp = fp; bss->cmd = &cmd; rmc(&cmd); @@ -124,8 +124,8 @@ badcmd(int error) Rmucmd *cmd = bss->cmd; dbg("bad RMC: %d, %d = %d\n", cmd->class, cmd->func, error); - cmd->fp->x0 = error; - swtch(cmd->fp); + bss->fp->x0 = error; + swtch(bss->fp); } /* @@ -171,5 +171,5 @@ rmc(Rmucmd *cmd) fp = (void (*) (Rmucmd *)) bp; (*fp)(cmd); - cmd->fp->x0 = SUCCESS; + bss->fp->x0 = SUCCESS; } diff --git a/test/unit/test1/genrmu.sh b/test/unit/test1/genrmu.sh @@ -8,7 +8,7 @@ genfile() #include <rcode.h> void -$1(Rmucmd *cmd) +$1(void) { puts("$1"); } diff --git a/test/unit/test1/test.c b/test/unit/test1/test.c @@ -14,7 +14,7 @@ main(int argc, char *argv[]) Rmucmd cmd; struct trapframe frame; - cmd.fp = &frame; + bss->fp = &frame; for (i = 0; i < 256; i++) { for (j = 0; j < 256; j++) { cmd.class = i;