lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lib][fixed_point] move fixed point routines into a separate library

Browse Source
This commit is contained in:
Travis Geiselbrecht
2014-08-26 16:58:10 -07:00
parent 012c777655
commit 06f1e752cd
7 changed files with 288 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev/timer/arm_cortex_a9/rules.mk
View File

@@ -8,6 +8,9 @@ GLOBAL_INCLUDES += \
GLOBAL_DEFINES += \
PLATFORM_HAS_DYNAMIC_TIMER=1
MODULE_DEPS += \
lib/fixed_point
MODULE_SRCS += \
$(LOCAL_DIR)/arm_cortex_a9_timer.c

137
dev/timer/arm_generic/fixed_point.h
View File

@@ -1,137 +0,0 @@
/*
* Copyright (c) 2013, Google Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files
* (the "Software"), to deal in the Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef __FIXED_POINT_H
#define __FIXED_POINT_H
#include <stdint.h>
struct fp_32_64 {
uint32_t l0; /* unshifted value */
uint32_t l32; /* value shifted left 32 bits (or bit -1 to -32) */
uint32_t l64; /* value shifted left 64 bits (or bit -33 to -64) */
};
#include "fixed_point_debug.h"
static void
fp_32_64_div_32_32(struct fp_32_64 *result, uint32_t dividend, uint32_t divisor)
{
uint64_t tmp;
uint32_t rem;
tmp = ((uint64_t)dividend << 32) / divisor;
rem = ((uint64_t)dividend << 32) % divisor;
result->l0 = tmp >> 32;
result->l32 = tmp;
tmp = ((uint64_t)rem << 32) / divisor;
result->l64 = tmp;
}
static uint64_t
mul_u32_u32(uint32_t a, uint32_t b, int a_shift, int b_shift)
{
uint64_t ret = (uint64_t)a * b;
debug_mul_u32_u32(a, b, a_shift, b_shift, ret);
return ret;
}
static uint64_t
u64_mul_u32_fp32_64(uint32_t a, struct fp_32_64 b)
{
uint64_t tmp;
uint64_t res_0;
uint64_t res_l32;
uint32_t res_l32_32;
uint64_t ret;
res_0 = mul_u32_u32(a, b.l0, 0, 0);
tmp = mul_u32_u32(a, b.l32, 0, -32);
res_0 += tmp >> 32;
res_l32 = (uint32_t)tmp;
res_l32 += mul_u32_u32(a, b.l64, 0, -64) >> 32; /* Improve rounding accuracy */
res_0 += res_l32 >> 32;
res_l32_32 = res_l32;
ret = res_0 + (res_l32_32 >> 31); /* Round to nearest integer */
debug_u64_mul_u32_fp32_64(a, b, res_0, res_l32_32, ret);
return ret;
}
static uint32_t
u32_mul_u64_fp32_64(uint64_t a, struct fp_32_64 b)
{
uint32_t a_r32 = a >> 32;
uint32_t a_0 = a;
uint64_t res_l32;
uint32_t ret;
/* mul_u32_u32(a_r32, b.l0, 32, 0) does not affect result */
res_l32 = mul_u32_u32(a_0, b.l0, 0, 0) << 32;
res_l32 += mul_u32_u32(a_r32, b.l32, 32, -32) << 32;
res_l32 += mul_u32_u32(a_0, b.l32, 0, -32);
res_l32 += mul_u32_u32(a_r32, b.l64, 32, -64);
res_l32 += mul_u32_u32(a_0, b.l64, 0, -64) >> 32; /* Improve rounding accuracy */
ret = (res_l32 >> 32) + ((uint32_t)res_l32 >> 31); /* Round to nearest integer */
debug_u32_mul_u64_fp32_64(a, b, res_l32, ret);
return ret;
}
static uint64_t
u64_mul_u64_fp32_64(uint64_t a, struct fp_32_64 b)
{
uint32_t a_r32 = a >> 32;
uint32_t a_0 = a;
uint64_t res_0;
uint64_t res_l32;
uint32_t res_l32_32;
uint64_t tmp;
uint64_t ret;
tmp = mul_u32_u32(a_r32, b.l0, 32, 0);
res_0 = tmp << 32;
tmp = mul_u32_u32(a_0, b.l0, 0, 0);
res_0 += tmp;
tmp = mul_u32_u32(a_r32, b.l32, 32, -32);
res_0 += tmp;
tmp = mul_u32_u32(a_0, b.l32, 0, -32);
res_0 += tmp >> 32;
res_l32 = (uint32_t)tmp;
tmp = mul_u32_u32(a_r32, b.l64, 32, -64);
res_0 += tmp >> 32;
res_l32 += (uint32_t)tmp;
tmp = mul_u32_u32(a_0, b.l64, 0, -64); /* Improve rounding accuracy */
res_l32 += tmp >> 32;
res_0 += res_l32 >> 32;
res_l32_32 = res_l32;
ret = res_0 + (res_l32_32 >> 31); /* Round to nearest integer */
debug_u64_mul_u64_fp32_64(a, b, res_0, res_l32_32, ret);
return ret;
}
#endif

130
dev/timer/arm_generic/fixed_point_debug.h
View File

@@ -1,130 +0,0 @@
/*
* Copyright (c) 2013, Google Inc. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files
* (the "Software"), to deal in the Software without restriction,
* including without limitation the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef __FIXED_POINT_DEBUG_H
#define __FIXED_POINT_DEBUG_H
static const char *
fpd_shift_prefix_32(int shift)
{
switch(shift) {
case 32:
return "";
case 0:
return " ";
case -32:
return " 0.";
case -64:
return " 0.00000000 ";
default:
return "???";
}
}
static const char *
fpd_shift_prefix_64(int shift)
{
switch(shift) {
case 32:
return "";
case 0:
return " ";
case -32:
return " ";
case -64:
return " 0.";
default:
return "???";
}
}
static const char *
fpd_shift_suffix(int shift)
{
switch(shift) {
case 32:
return " 00000000 ";
case 0:
return " ";
case -32:
return " ";
case -64:
return "";
default:
return "???";
}
}
static void
debug_mul_u32_u32(uint32_t a, uint32_t b, int a_shift, int b_shift, uint64_t ret)
{
LTRACEF_LEVEL(5, " %s%08x%s * %s%08x%s = %s%08x%s%08x%s\n",
fpd_shift_prefix_32(a_shift), a, fpd_shift_suffix(a_shift),
fpd_shift_prefix_32(b_shift), b, fpd_shift_suffix(b_shift),
fpd_shift_prefix_64(a_shift + b_shift),
(uint32_t)(ret >> 32),
(a_shift + b_shift == -32) ? "." : " ",
(uint32_t)ret,
fpd_shift_suffix(a_shift + b_shift));
}
static void
debug_u64_mul_u32_fp32_64(uint32_t a, struct fp_32_64 b, uint64_t res_0, uint32_t res_l32_32, uint64_t ret)
{
LTRACEF_LEVEL(5, " %08x * %08x.%08x %08x"
" = %08x %08x.%08x\n",
a, b.l0, b.l32, b.l64,
(uint32_t)(res_0 >> 32), (uint32_t)res_0, res_l32_32);
LTRACEF_LEVEL(5, " "
" "
"~= %08x %08x\n",
(uint32_t)(ret >> 32), (uint32_t)ret);
}
static void
debug_u32_mul_u64_fp32_64(uint64_t a, struct fp_32_64 b, uint64_t res_l32, uint32_t ret)
{
LTRACEF_LEVEL(4, "%08x %08x * %08x.%08x %08x"
" = %08x.%08x\n",
(uint32_t)(a >> 32), (uint32_t)a, b.l0, b.l32, b.l64,
(uint32_t)(res_l32 >> 32), (uint32_t)res_l32);
LTRACEF_LEVEL(5, " "
" "
"~= %08x\n",
ret);
}
static void
debug_u64_mul_u64_fp32_64(uint64_t a, struct fp_32_64 b, uint64_t res_0, uint32_t res_l32_32, uint64_t ret)
{
LTRACEF_LEVEL(4, "%08x %08x * %08x.%08x %08x"
" = %08x %08x.%08x\n",
(uint32_t)(a >> 32), (uint32_t)a, b.l0, b.l32, b.l64,
(uint32_t)(res_0 >> 32), (uint32_t)res_0, res_l32_32);
LTRACEF_LEVEL(5, " "
" "
"~= %08x %08x\n",
(uint32_t)(ret >> 32), (uint32_t)ret);
}
#endif