Imperial-MEng/pintos_22
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor fixed-point.h to match style standards

Browse Source
This commit is contained in:
EDiasAlberto
2024-10-24 20:16:40 +01:00
parent e749936b1f
commit 49a9284f02
2 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/threads/fixed-point.h
View File

@@ -3,37 +3,40 @@
#define FIXED_POINT_H #define FIXED_POINT_H
typedef struct typedef struct
{ {
int32_t raw; int32_t raw;
} fp32_t; } fp32_t;
/* Fixed Point Arithmetic bit count constants */ /* Fixed Point Arithmetic bit count constants */
#define NUM_FRAC_BITS 14 #define NUM_FRAC_BITS 14
#define NUM_INT_BITS (31 - NUM_FRAC_BITS) #define NUM_INT_BITS (31 - NUM_FRAC_BITS)
#define CONVERSION_CONST (1 << NUM_FRAC_BITS) /* f = 2^q, (2^20) */ #define CONVERSION_FACTOR (1 << NUM_FRAC_BITS) /* f = 2^q, (2^14) */
/* Fixed Point Arithmetic conversion operations */ /* Fixed Point Arithmetic conversion operations */
/* Converts an integer n to a fixed point number */ /* Converts an integer n to a fixed point number */
inline fp32_t inline fp32_t
int_to_fp (int32_t n) fp_from_int (int32_t n)
{ {
return (fp32_t){ n * CONVERSION_CONST }; return (fp32_t){ n * CONVERSION_FACTOR };
} }
/* Handles conversion of fixed point to integer. First version truncates, second one rounds */ /* Handles conversion of fixed point to integer,
with truncation */
inline int32_t inline int32_t
fp_floor (fp32_t x) fp_floor (fp32_t x)
{ {
return x.raw / CONVERSION_CONST; return x.raw / CONVERSION_FACTOR;
} }
/* Handles conversion of fixed point to integer,
with rounding */
inline int32_t inline int32_t
fp_round (fp32_t x) fp_round (fp32_t x)
{ {
if (x.raw >= 0) if (x.raw >= 0)
return (x.raw + CONVERSION_CONST / 2) / CONVERSION_CONST; return (x.raw + CONVERSION_FACTOR / 2) / CONVERSION_FACTOR;
else else
return (x.raw - CONVERSION_CONST / 2) / CONVERSION_CONST; return (x.raw - CONVERSION_FACTOR / 2) / CONVERSION_FACTOR;
} }
/* Add two fixed points */ /* Add two fixed points */
@@ -50,32 +53,20 @@ fp_sub (fp32_t x, fp32_t y)
return (fp32_t){ x.raw - y.raw }; return (fp32_t){ x.raw - y.raw };
} }
/* Add fixed point to integer */
inline fp32_t
fp_add_int (fp32_t x, int32_t n)
{
return (fp32_t){ x.raw + n * CONVERSION_CONST };
}
/* Subtract integer from fixed point */
inline fp32_t
fp_sub_int (fp32_t x, int32_t n)
{
return (fp32_t){ x.raw - n * CONVERSION_CONST };
}
/* Multiple two fixed points */ /* Multiple two fixed points */
inline fp32_t inline fp32_t
fp_mul (fp32_t x, fp32_t y) fp_mul (fp32_t x, fp32_t y)
{ {
return (fp32_t){ ((int64_t)x.raw) * y.raw / CONVERSION_CONST }; return (fp32_t){ ((int64_t)x.raw) * y.raw / CONVERSION_FACTOR };
} }
/* Divide two fixed points */ /* Divide two fixed points */
inline fp32_t inline fp32_t
fp_div (fp32_t x, fp32_t y) fp_div (fp32_t x, fp32_t y)
{ {
return (fp32_t){ ((int64_t)x.raw) * CONVERSION_CONST / y.raw }; return (fp32_t){ ((int64_t)x.raw) * CONVERSION_FACTOR / y.raw };
} }
/* Multiply fixed point and integer */ /* Multiply fixed point and integer */
@@ -92,4 +83,18 @@ fp_div_int (fp32_t x, int32_t n)
return (fp32_t){ x.raw / n }; return (fp32_t){ x.raw / n };
} }
/* Add fixed point to integer */
inline fp32_t
fp_add_int (fp32_t x, int32_t n)
{
return (fp32_t){ x.raw + n * CONVERSION_FACTOR };
}
/* Subtract integer from fixed point */
inline fp32_t
fp_sub_int (fp32_t x, int32_t n)
{
return (fp32_t){ x.raw - n * CONVERSION_FACTOR };
}
#endif //FIXED_POINT_H #endif //FIXED_POINT_H

2
src/threads/thread.c
View File

@@ -163,7 +163,7 @@ thread_tick (void)
if (t != idle_thread) if (t != idle_thread)
ready++; ready++;
fp32_t old_coeff = fp_div_int (fp_mul_int(load_avg, 59), 60); fp32_t old_coeff = fp_div_int (fp_mul_int(load_avg, 59), 60);
fp32_t new_coeff = fp_div_int (int_to_fp (ready), 60); fp32_t new_coeff = fp_div_int (fp_from_int (ready), 60);
load_avg = fp_add (old_coeff, new_coeff); load_avg = fp_add (old_coeff, new_coeff);
thread_foreach (thread_update_recent_cpu, NULL); thread_foreach (thread_update_recent_cpu, NULL);