From bba6ba8f3dbceb1981beb991c0cfcae41e443fad Mon Sep 17 00:00:00 2001 From: Stefan Doehla Date: Tue, 17 Dec 2024 10:43:06 +0100 Subject: [PATCH 1/4] remove broken and unused L_add_c --- lib_com/basop32.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib_com/basop32.c b/lib_com/basop32.c index 732e33b2a..df5ae4456 100644 --- a/lib_com/basop32.c +++ b/lib_com/basop32.c @@ -2123,11 +2123,8 @@ Word32 L_add_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow ) return ( L_var_out ); } -Word32 L_add_c( Word32 L_var1, Word32 L_var2 ) -{ - return L_add_co( L_var1, L_var2, NULL, NULL ); -} #endif + /*___________________________________________________________________________ | | | Function Name : L_sub_c | -- GitLab From 2815be0961b118734757fbb2e197812ea7026be0 Mon Sep 17 00:00:00 2001 From: Stefan Doehla Date: Tue, 17 Dec 2024 10:47:29 +0100 Subject: [PATCH 2/4] undeprecate L_add_c --- lib_com/basop32.c | 6 +++--- lib_com/basop32.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib_com/basop32.c b/lib_com/basop32.c index df5ae4456..23b7a68c0 100644 --- a/lib_com/basop32.c +++ b/lib_com/basop32.c @@ -1571,7 +1571,7 @@ Word32 DEPR_L_macNs( Word32 L_var3, Word16 var1, Word16 var2, Flag *Carry ) Word32 L_var_out; L_var_out = L_mult( var1, var2 ); - L_var_out = DEPR_L_add_c( L_var3, L_var_out, Carry ); + L_var_out = L_add_c( L_var3, L_var_out, Carry ); #ifdef WMOPS multiCounter[currCounter].L_mult--; @@ -1938,7 +1938,7 @@ Word32 L_sub_sat( Word32 L_var1, Word32 L_var2 ) #ifndef BASOP_NOGLOB Word32 L_add_c( Word32 L_var1, Word32 L_var2 ) #else /* BASOP_NOGLOB */ -Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry ) +Word32 L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry ) #endif /* BASOP_NOGLOB */ { Word32 L_var_out; @@ -2196,7 +2196,7 @@ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry ) #ifndef BASOP_NOGLOB L_var_out = L_add_c( L_var1, -L_var2 ); #else /* BASOP_NOGLOB */ - L_var_out = DEPR_L_add_c( L_var1, -L_var2, Carry ); + L_var_out = L_add_c( L_var1, -L_var2, Carry ); #endif /* BASOP_NOGLOB */ #ifdef WMOPS multiCounter[currCounter].L_add_c--; diff --git a/lib_com/basop32.h b/lib_com/basop32.h index 785a4bf56..4d050f189 100644 --- a/lib_com/basop32.h +++ b/lib_com/basop32.h @@ -189,7 +189,7 @@ Word16 shr_r( Word16 var1, Word16 var2 ); /* Shift right with #else /* BASOP_NOGLOB */ Word32 L_add( Word32 L_var1, Word32 L_var2 ); /* Long add, 1 */ Word32 L_sub( Word32 L_var1, Word32 L_var2 ); /* Long sub, 1 */ -Word32 DEPR_L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry ); /* Long add with c, 2 */ +Word32 L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry ); /* Long add with c, 2 */ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry ); /* Long sub with c, 2 */ Word32 L_negate( Word32 L_var1 ); /* Long negate, 1 */ Word16 mult_r( Word16 var1, Word16 var2 ); /* Mult with round, 1 */ -- GitLab From d8d766b8f0c87b175b15d54aaadb228ad2ef6abe Mon Sep 17 00:00:00 2001 From: Stefan Doehla Date: Tue, 17 Dec 2024 10:56:43 +0100 Subject: [PATCH 3/4] undeprecate L_add_c --- lib_com/basop32.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib_com/basop32.h b/lib_com/basop32.h index 4d050f189..42b4d2d0b 100644 --- a/lib_com/basop32.h +++ b/lib_com/basop32.h @@ -163,7 +163,6 @@ Word32 L_macNs( Word32 L_var3, Word16 var1, Word16 var2 ); /* Word32 L_msuNs( Word32 L_var3, Word16 var1, Word16 var2 ); /* Msu without sat, 1 */ Word32 L_add_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow ); Word32 L_sub_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow ); -Word32 L_add_c( Word32 L_var1, Word32 L_var2 ); /* Long add with c, 2 */ Word32 L_sub_c( Word32 L_var1, Word32 L_var2 ); /* Long sub with c, 2 */ #endif /* BASOP_NOGLOB */ @@ -189,7 +188,7 @@ Word16 shr_r( Word16 var1, Word16 var2 ); /* Shift right with #else /* BASOP_NOGLOB */ Word32 L_add( Word32 L_var1, Word32 L_var2 ); /* Long add, 1 */ Word32 L_sub( Word32 L_var1, Word32 L_var2 ); /* Long sub, 1 */ -Word32 L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry ); /* Long add with c, 2 */ +Word32 L_add_c( Word32 L_var1, Word32 L_var2, Flag *Carry ); /* Long add with c, 2 */ Word32 DEPR_L_sub_c( Word32 L_var1, Word32 L_var2, Flag *Carry ); /* Long sub with c, 2 */ Word32 L_negate( Word32 L_var1 ); /* Long negate, 1 */ Word16 mult_r( Word16 var1, Word16 var2 ); /* Mult with round, 1 */ -- GitLab From 9566a0f2b9c8f58aba4c8c3c697fe32a4e2efb34 Mon Sep 17 00:00:00 2001 From: Stefan Doehla Date: Tue, 17 Dec 2024 11:26:15 +0100 Subject: [PATCH 4/4] add missing multicounter to L_add_co --- lib_com/basop32.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib_com/basop32.c b/lib_com/basop32.c index 23b7a68c0..7f947a64c 100644 --- a/lib_com/basop32.c +++ b/lib_com/basop32.c @@ -2121,6 +2121,9 @@ Word32 L_add_co( Word32 L_var1, Word32 L_var2, Flag *Carry, Flag *Overflow ) carry_int ? set_carry( Carry ) : unset_carry( Carry ); } +#ifdef WMOPS + multiCounter[currCounter].L_add_c++; +#endif return ( L_var_out ); } #endif -- GitLab