aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/arm/skyeye_common/vfp/vfp_helper.h
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-07-25 23:12:34 -0400
committerGravatar bunnei <bunneidev@gmail.com>2015-07-25 23:12:34 -0400
commit392c7feba0cd152e46ffbe6089def35082fa2692 (patch)
treed959d1751d99a6f5307b45d04e46c19c53d5efc2 /src/core/arm/skyeye_common/vfp/vfp_helper.h
parent453764aefc3b822d08dae3642fab83ea1adf2bc8 (diff)
parent03213f893e7f2cbd692144334ac72d9138fd5e70 (diff)
Merge pull request #990 from lioncash/arm
dyncom: General cleanup
Diffstat (limited to 'src/core/arm/skyeye_common/vfp/vfp_helper.h')
-rw-r--r--src/core/arm/skyeye_common/vfp/vfp_helper.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/skyeye_common/vfp/vfp_helper.h b/src/core/arm/skyeye_common/vfp/vfp_helper.h
index 2007d6dc..91a8d4d5 100644
--- a/src/core/arm/skyeye_common/vfp/vfp_helper.h
+++ b/src/core/arm/skyeye_common/vfp/vfp_helper.h
@@ -34,7 +34,7 @@
#include <cstdio>
#include "common/common_types.h"
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/vfp/asm_vfp.h"
#define do_div(n, base) {n/=base;}
@@ -415,7 +415,7 @@ struct op {
u32 flags;
};
-static inline u32 fls(ARMword x)
+static inline u32 fls(u32 x)
{
int r = 32;