summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2010-03-16 08:15:16 -0700
committerNathan Binkert <nate@binkert.org>2010-03-16 08:15:16 -0700
commit86207a69e446b51ede7c6f713f1bbec55a2fd691 (patch)
tree5a1be9be3c6fde7bd7a5a0232032da392f199e08
parentedb59ed263697366a7817bf4c9afa5fe9841a156 (diff)
downloadgem5-86207a69e446b51ede7c6f713f1bbec55a2fd691.tar.xz
orion: Make declarations match definition
-rw-r--r--src/mem/ruby/network/orion/SIM_power.hh5
-rw-r--r--src/mem/ruby/network/orion/power_utils.hh8
2 files changed, 9 insertions, 4 deletions
diff --git a/src/mem/ruby/network/orion/SIM_power.hh b/src/mem/ruby/network/orion/SIM_power.hh
index 250e710e3..aa8448436 100644
--- a/src/mem/ruby/network/orion/SIM_power.hh
+++ b/src/mem/ruby/network/orion/SIM_power.hh
@@ -359,7 +359,7 @@ typedef enum {
*/
/* some utility routines */
-extern unsigned int SIM_power_logtwo(LIB_Type_max_uint x);
+extern uint32_t SIM_power_logtwo(uint64_t x);
//extern int SIM_power_squarify(int rows, int cols);
extern double SIM_power_driver_size(double driving_cap, double desiredrisetime);
@@ -371,7 +371,8 @@ extern double SIM_power_restowidth(double res, int nchannel);
extern int SIM_power_init(void);
-extern unsigned int SIM_power_Hamming(LIB_Type_max_uint old_val, LIB_Type_max_uint new_val, LIB_Type_max_uint mask);
+extern uint32_t SIM_power_Hamming(uint64_t old_val, uint64_t new_val,
+ uint64_t mask);
extern unsigned int SIM_power_Hamming_group(LIB_Type_max_uint d1_new, LIB_Type_max_uint d1_old, LIB_Type_max_uint d2_new, LIB_Type_max_uint d2_old, u_int width, u_int n_grp);
/* statistical functions */
diff --git a/src/mem/ruby/network/orion/power_utils.hh b/src/mem/ruby/network/orion/power_utils.hh
index 59123c1f7..8f0343989 100644
--- a/src/mem/ruby/network/orion/power_utils.hh
+++ b/src/mem/ruby/network/orion/power_utils.hh
@@ -28,8 +28,12 @@
#ifndef _POWER_UTILS_H
#define _POWER_UTILS_H
-extern unsigned SIM_power_Hamming(unsigned long int old_val, unsigned long int new_val, unsigned long int mask);
+
+#include "base/types.hh"
+
+extern uint32_t SIM_power_Hamming(uint64_t old_val, uint64_t new_val,
+ uint64_t mask);
extern double logtwo(double x);
-extern unsigned SIM_power_logtwo(unsigned long int x);
+extern uint32_t SIM_power_logtwo(uint64_t x);
#endif