From 34277630ff74cd68a100a052b855004b6b8aad6a Mon Sep 17 00:00:00 2001
From: Michael Platzer <michael.platzer@tuwien.ac.at>
Date: Wed, 1 Apr 2020 12:54:55 +0200
Subject: [PATCH] sequential/ammunition: replace all long by long long
---
bench/sequential/ammunition/ammunition_libc.c | 2 +-
bench/sequential/ammunition/arithm.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bench/sequential/ammunition/ammunition_libc.c b/bench/sequential/ammunition/ammunition_libc.c
index cd6887e9..ed751f72 100755
--- a/bench/sequential/ammunition/ammunition_libc.c
+++ b/bench/sequential/ammunition/ammunition_libc.c
@@ -145,7 +145,7 @@ int ammunition_sprintf_u( char *s, unsigned int number )
/* How many decimal digits do we need? */
char digits = 0;
unsigned char writePos = 0;
- unsigned long copyOfNumber = number;
+ unsigned long long copyOfNumber = number;
_Pragma( "loopbound min 1 max 10" )
do {
digits++;
diff --git a/bench/sequential/ammunition/arithm.c b/bench/sequential/ammunition/arithm.c
index b04ac2d5..4f287d99 100755
--- a/bench/sequential/ammunition/arithm.c
+++ b/bench/sequential/ammunition/arithm.c
@@ -246,7 +246,7 @@ int ammunition_multiply_unsigned_integer_without_overflow_reaction
int op1_digit_num;
int op2_digit_num;
int carry;
- unsigned long int partial_sum;
+ unsigned long long int partial_sum;
int result_digit_number;
int overflow_flag;
unsigned char long_result [ 2 * MAX_INTEGER_OPERAND_SIZE ];
@@ -384,8 +384,8 @@ int ammunition_divide_unsigned_integer_without_overflow_reaction
/* Division by digit. */
int digit_num;
int digit;
- unsigned long divisable;
- unsigned long remainder;
+ unsigned long long divisable;
+ unsigned long long remainder;
digit = ( ( unsigned char * ) op2 ) [ first_nonzero_digit_number ];
ammunition_memcpy ( result, op1, ( size_t ) size );
@@ -434,7 +434,7 @@ int ammunition_divide_unsigned_integer_without_overflow_reaction
_Pragma( "loopbound min 0 max 0" )
while ( normalized_op2 [ first_nonzero_digit_number + 1 ] * q_approximation
- > ( ( ( unsigned long int ) scaled_op1 [ scaled_op1_digit_num ]
+ > ( ( ( unsigned long long int ) scaled_op1 [ scaled_op1_digit_num ]
* ( UCHAR_MAX + 1 )
+ scaled_op1 [ scaled_op1_digit_num + 1 ]
- q_approximation
@@ -1168,8 +1168,8 @@ ammunition_unsigned_integer_to_based_string ( int size, const void *operand,
{
int digit_num;
int i;
- unsigned long divisable;
- unsigned long remainder;
+ unsigned long long divisable;
+ unsigned long long remainder;
int nonzero_flag;
int length;
int temporary;
--
GitLab