@@ -114,14 +114,16 @@ static void secp256k1_ecmult_odd_multiples_table(int n, secp256k1_ge *pre_a, sec
114
114
secp256k1_fe_mul (z , & ai .z , & d .z );
115
115
}
116
116
117
- #define SECP256K1_ECMULT_TABLE_VERIFY (n ,w ) \
118
- (void)w; \
119
- VERIFY_CHECK(((n) & 1) == 1); \
120
- VERIFY_CHECK((n) >= -((1 << ((w)-1)) - 1)); \
117
+ SECP256K1_INLINE static void secp256k1_ecmult_table_verify (int n , int w ) {
118
+ (void )n ;
119
+ (void )w ;
120
+ VERIFY_CHECK (((n ) & 1 ) == 1 );
121
+ VERIFY_CHECK ((n ) >= - ((1 << ((w )- 1 )) - 1 ));
121
122
VERIFY_CHECK ((n ) <= ((1 << ((w )- 1 )) - 1 ));
123
+ }
122
124
123
125
SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge (secp256k1_ge * r , const secp256k1_ge * pre , int n , int w ) {
124
- SECP256K1_ECMULT_TABLE_VERIFY (n ,w )
126
+ secp256k1_ecmult_table_verify (n ,w );
125
127
if (n > 0 ) {
126
128
* r = pre [(n - 1 )/2 ];
127
129
} else {
@@ -131,7 +133,7 @@ SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge(secp256k1_ge *r, cons
131
133
}
132
134
133
135
SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge_lambda (secp256k1_ge * r , const secp256k1_ge * pre , const secp256k1_fe * x , int n , int w ) {
134
- SECP256K1_ECMULT_TABLE_VERIFY (n ,w )
136
+ secp256k1_ecmult_table_verify (n ,w );
135
137
if (n > 0 ) {
136
138
secp256k1_ge_set_xy (r , & x [(n - 1 )/2 ], & pre [(n - 1 )/2 ].y );
137
139
} else {
@@ -141,7 +143,7 @@ SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge_lambda(secp256k1_ge *
141
143
}
142
144
143
145
SECP256K1_INLINE static void secp256k1_ecmult_table_get_ge_storage (secp256k1_ge * r , const secp256k1_ge_storage * pre , int n , int w ) {
144
- SECP256K1_ECMULT_TABLE_VERIFY (n ,w )
146
+ secp256k1_ecmult_table_verify (n ,w );
145
147
if (n > 0 ) {
146
148
secp256k1_ge_from_storage (r , & pre [(n - 1 )/2 ]);
147
149
} else {
0 commit comments