diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-05-22 22:54:56 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-05-22 22:54:56 -0400 |
| commit | 1de7e8cbe4ee9aab3bc920721a90ef63537771b8 (patch) | |
| tree | 4aae70232dc6d148af003a4d9f1c4f76aff5467b /src/core/arm/interpreter/vfp/vfp_helper.h | |
| parent | 9592d61037d05dc53b454644671a441788996208 (diff) | |
| parent | 204c6bfeca2d3bccfe6602699c0b3420f88aaf07 (diff) | |
Merge branch 'master' of https://github.com/bunnei/citra
Diffstat (limited to 'src/core/arm/interpreter/vfp/vfp_helper.h')
| -rw-r--r-- | src/core/arm/interpreter/vfp/vfp_helper.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/interpreter/vfp/vfp_helper.h b/src/core/arm/interpreter/vfp/vfp_helper.h index 80f9a93f4..b222e79f1 100644 --- a/src/core/arm/interpreter/vfp/vfp_helper.h +++ b/src/core/arm/interpreter/vfp/vfp_helper.h @@ -50,7 +50,7 @@ #define pr_info //printf #define pr_debug //printf -static u32 fls(int x); +static u32 vfp_fls(int x); #define do_div(n, base) {n/=base;} /* From vfpinstr.h */ @@ -508,7 +508,7 @@ struct op { u32 flags; }; -static inline u32 fls(int x) +static u32 vfp_fls(int x) { int r = 32; |