diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2018-11-14 14:41:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 14:41:54 +0100 |
| commit | 0f2f1b094b663caa4df3a375858e4a93df0227d0 (patch) | |
| tree | cfcb108aeb64ca3a5afac47b99f05fcbe54723c0 | |
| parent | 0c351de79e3e9e0d4ebfef7c4e801d8fabcd0449 (diff) | |
| parent | d4a1e3bdb46dd64a20eaf0bd378cc508b7146587 (diff) | |
| download | miasm-0f2f1b094b663caa4df3a375858e4a93df0227d0.tar.gz miasm-0f2f1b094b663caa4df3a375858e4a93df0227d0.zip | |
Merge pull request #880 from w4kfu/cntleadzeros_return_value
change return type of cntleadzeros to uint64_t
| -rw-r--r-- | miasm2/jitter/op_semantics.c | 6 | ||||
| -rw-r--r-- | miasm2/jitter/op_semantics.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/miasm2/jitter/op_semantics.c b/miasm2/jitter/op_semantics.c index 33a07054..091da87f 100644 --- a/miasm2/jitter/op_semantics.c +++ b/miasm2/jitter/op_semantics.c @@ -253,15 +253,15 @@ uint64_t rot_right(uint64_t size, uint64_t a, uint64_t b) * - cntleadzeros(size=32, src=2): 30 * - cntleadzeros(size=32, src=0): 32 */ -unsigned int cntleadzeros(uint64_t size, uint64_t src) +uint64_t cntleadzeros(uint64_t size, uint64_t src) { int64_t i; for (i=(int64_t)size-1; i>=0; i--){ if (src & (1ull << i)) - return (unsigned int)(size - (i + 1)); + return (uint64_t)(size - (i + 1)); } - return (unsigned int)size; + return (uint64_t)size; } /* diff --git a/miasm2/jitter/op_semantics.h b/miasm2/jitter/op_semantics.h index f797e52b..921c9b9e 100644 --- a/miasm2/jitter/op_semantics.h +++ b/miasm2/jitter/op_semantics.h @@ -37,7 +37,7 @@ _MIASM_EXPORT unsigned int umul16_hi(unsigned short a, unsigned short b); _MIASM_EXPORT uint64_t rot_left(uint64_t size, uint64_t a, uint64_t b); _MIASM_EXPORT uint64_t rot_right(uint64_t size, uint64_t a, uint64_t b); -_MIASM_EXPORT unsigned int cntleadzeros(uint64_t size, uint64_t src); +_MIASM_EXPORT uint64_t cntleadzeros(uint64_t size, uint64_t src); _MIASM_EXPORT unsigned int cnttrailzeros(uint64_t size, uint64_t src); #define UDIV(sizeA) \ |