From c3d35bdc2ebfc9a62efc5d1c170e4f76ba0b11b3 Mon Sep 17 00:00:00 2001 From: root <root@DESKTOP-QJBICG3.localdomain> Date: Tue, 18 Aug 2020 21:37:44 +0900 Subject: [PATCH] updated test.c --- a.out | Bin 17440 -> 17928 bytes fx_s4716_double.c | 4 +-- fx_s4716_longlong.c | 26 ++++++++-------- fx_s4716_longlong.h | 14 +++++---- test.c | 71 +++++++++++++++++++++++++------------------- 5 files changed, 64 insertions(+), 51 deletions(-) diff --git a/a.out b/a.out index ff394b99890b55a2a041060b669b63eaa0a38aad..e847ac1488019bf073dd585964f3a6b6a910ef5e 100644 GIT binary patch delta 5243 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 Z?seAYw18%hkCP8Nn=@(JPX6Vr1_0)LjA{S? delta 3155 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 M@T3?gud<T^00;4=(f|Me diff --git a/fx_s4716_double.c b/fx_s4716_double.c index 911464d..94d92e6 100644 --- a/fx_s4716_double.c +++ b/fx_s4716_double.c @@ -18,11 +18,11 @@ void fx_sub(fx_s4716 a, fx_s4716 b){ } void fx_mul(fx_s4716 a, fx_s4716 b){ double mul=FX_S4716_DOUBLE_MUL(a,b); - printf("fx mul : %.16lf\n",mul); + printf("fx mul : %.16lf\n",DOUBLE_TO_FX(mul)); } void fx_div(fx_s4716 a, fx_s4716 b){ double div=FX_S4716_DOUBLE_DIV(a,b); - printf("fx div : %.16lf\n",div); + printf("fx div : %.16lf\n",DOUBLE_TO_FX(div)); } void fx_pi(){ printf("pi : %.16lf\n",FX_PI); diff --git a/fx_s4716_longlong.c b/fx_s4716_longlong.c index 2df33b0..48136a8 100644 --- a/fx_s4716_longlong.c +++ b/fx_s4716_longlong.c @@ -13,31 +13,31 @@ long long fx_to_longlong(fx_s4716 a){ fx_s4716 longlong_to_fx(long long a){ return a << 16; } -fx_s4716 fx_s4716_longlong_mul(fx_s4716 a, fx_s4716 b){ +fx_s4716 fx_s4716_longlong_mul1(fx_s4716 a, fx_s4716 b){ long long result=FX_S4716_LONGLONG_MUL1(a, b); - return result; + return longlong_to_fx(result); } -fx_s4716 fx_s4716_longlong_mul1(fx_s4716 a, fx_s4716 b){ +fx_s4716 fx_s4716_longlong_mul2(fx_s4716 a, fx_s4716 b){ long long result=FX_S4716_LONGLONG_MUL2(a, b); - return result; + return longlong_to_fx(result); } -fx_s4716 fx_s4716_longlong_mul2(fx_s4716 a, fx_s4716 b){ +fx_s4716 fx_s4716_longlong_mul3(fx_s4716 a, fx_s4716 b){ long long result=FX_S4716_LONGLONG_MUL3(a, b); - return result; + return longlong_to_fx(result); } -fx_s4716 fx_s4716_longlong_div(fx_s4716 a, fx_s4716 b){ +fx_s4716 fx_s4716_longlong_div1(fx_s4716 a, fx_s4716 b){ long long result=FX_S4716_LONGLONG_DIV1(a, b); - return result; + return fx_to_longlong(result); } -fx_s4716 fx_s4716_longlong_div1(fx_s4716 a, fx_s4716 b){ +fx_s4716 fx_s4716_longlong_div2(fx_s4716 a, fx_s4716 b){ long long result=FX_S4716_LONGLONG_DIV2(a, b); - return result; + return fx_to_longlong(result); } -fx_s4716 fx_s4716_longlong_div2(fx_s4716 a, fx_s4716 b){ +fx_s4716 fx_s4716_longlong_div3(fx_s4716 a, fx_s4716 b){ long long result=FX_S4716_LONGLONG_DIV3(a, b); - return result; + return fx_to_longlong(result); } fx_s4716 fx_s4716_longlong_sin(fx_s4716 a){ long long result=sinTable[a]; - return result; + return fx_to_longlong(result); } diff --git a/fx_s4716_longlong.h b/fx_s4716_longlong.h index 572348f..02b8d5e 100644 --- a/fx_s4716_longlong.h +++ b/fx_s4716_longlong.h @@ -1,7 +1,9 @@ -#define FX_S4716_LONGLONG_MUL(a, b) (((a) * (b)) >> 16) -#define FX_S4716_LONGLONG_MUL1(a, b) ((a >> 8) * (b >> 8)) -#define FX_S4716_LONGLONG_MUL2(a, b) (((a >> 4) * (b >> 4)) >> 8) +typedef long long fx_s4716; -#define FX_S4716_LONGLONG_DIV(a, b) ((a << 16) / (b)) -#define FX_S4716_LONGLONG_DIV1(a, b) (((a << 8) / (b)) << 8) -#define FX_S4716_LONGLONG_DIV2(a, b) (((a << 4) / (b >> 4)) << 8) +#define FX_S4716_LONGLONG_MUL1(a, b) (((a) * (b)) >> 16) +#define FX_S4716_LONGLONG_MUL2(a, b) ((a >> 8) * (b >> 8)) +#define FX_S4716_LONGLONG_MUL3(a, b) (((a >> 4) * (b >> 4)) >> 8) + +#define FX_S4716_LONGLONG_DIV1(a, b) ((a << 16) / (b)) +#define FX_S4716_LONGLONG_DIV2(a, b) (((a << 8) / (b)) << 8) +#define FX_S4716_LONGLONG_DIV3(a, b) (((a << 4) / (b >> 4)) << 8) diff --git a/test.c b/test.c index 29fcaa3..ae437d6 100644 --- a/test.c +++ b/test.c @@ -13,6 +13,16 @@ extern void fx_inv_pi(); extern void fx_sqrt(fx_s4716 a); extern void fx_pow(fx_s4716 a); extern void fx_sine(fx_s4716 a); +extern fx_s4716 longlong_to_fx(long long a); +extern long long fx_to_longlong(fx_s4716 a); +extern fx_s4716 fx_s4716_longlong_mul1(fx_s4716 a, fx_s4716 b); +extern fx_s4716 fx_s4716_longlong_mul2(fx_s4716 a, fx_s4716 b); +extern fx_s4716 fx_s4716_longlong_mul3(fx_s4716 a, fx_s4716 b); +extern fx_s4716 fx_s4716_longlong_div1(fx_s4716 a, fx_s4716 b); +extern fx_s4716 fx_s4716_longlong_div2(fx_s4716 a, fx_s4716 b); +extern fx_s4716 fx_s4716_longlong_div3(fx_s4716 a, fx_s4716 b); +extern fx_s4716 fx_s4716_longlong_sin(fx_s4716 a); + int main() { @@ -33,76 +43,76 @@ int main() else if(option == 1) { printf(" OPTION \n"); - printf("0. add \n"); - printf("1. subtract \n"); - printf("2. multiply \n"); - printf("3. divide \n"); - printf("4. square root \n"); - printf("5. power \n"); - printf("6. print PI \n"); - printf("7. print inverse PI \n"); - printf("8. fix to double \n"); - printf("9. double to fix \n"); - printf("10 get sine value \n"); - printf("11. quit\n\n"); + printf("1. add \n"); + printf("2. subtract \n"); + printf("3. multiply \n"); + printf("4. divide \n"); + printf("5. square root \n"); + printf("6. power \n"); + printf("7. print PI \n"); + printf("8. print inverse PI \n"); + printf("9. fix to double \n"); + printf("10. double to fix \n"); + printf("11. get sine value \n"); + printf("0. quit\n\n"); while (1) { printf("Type option : "); fflush(stdout); scanf("%d", &option); switch (option) { - case 0: + case 1: printf("Input two number : "); fflush(stdout); scanf("%lld %lld", &a, &b); fx_add(a, b); break; - case 1: + case 2: printf("Input two number : "); fflush(stdout); scanf("%lld %lld", &a, &b); fx_sub(a, b); break; - case 2: + case 3: printf("Input two number : "); fflush(stdout); scanf("%lld %lld", &a, &b); fx_mul(a, b); break; - case 3: + case 4: printf("Input two number : "); fflush(stdout); scanf("%lld %lld", &a, &b); fx_div(a, b); break; - case 4: + case 5: printf("Input one number : "); fflush(stdout); scanf("%lld", &a); fx_sqrt(a); break; - case 5: + case 6: printf("Input one number : "); fflush(stdout); scanf("%lld", &a); fx_pow(a); break; - case 6: + case 7: fx_pi(); break; - case 7: + case 8: fx_inv_pi(); break; - case 8: + case 9: printf("Input fix number : "); fflush(stdout); scanf("%lld", &a); fx_to_double(a); break; - case 9: + case 10: printf("Input double number : "); fflush(stdout); scanf("%lf", &c); double_to_fx(c); break; - case 10: + case 11: printf("Input one number : "); fflush(stdout); scanf("%lld", &a); fx_sine(a); break; - case 11: + case 0: quit = 1; default: break; @@ -131,21 +141,22 @@ int main() case 1 : printf("Input two number : "); fflush(stdout); scanf("%lld %lld", &a, &b); - t = fx_s4716_longlong_mul(a,b); - tt = fx_s4716_longlong_mul1(a,b); - ttt = fx_s4716_longlong_mul2(a,b); + t = fx_s4716_longlong_mul1(a,b); + tt = fx_s4716_longlong_mul2(a,b); + ttt = fx_s4716_longlong_mul3(a,b); printf("%lld %lld %lld\n", t, tt, ttt); break; case 2 : printf("Input two number : "); fflush(stdout); scanf("%lld %lld", &a, &b); - t = fx_s4716_longlong_div(a,b); - tt = fx_s4716_longlong_div1(a,b); - ttt = fx_s4716_longlong_div2(a,b); + t = fx_s4716_longlong_div1(a,b); + tt = fx_s4716_longlong_div2(a,b); + ttt = fx_s4716_longlong_div3(a,b); printf("%lld %lld %lld\n", t, tt, ttt); break; } } } + else {} } \ No newline at end of file -- GitLab