changeset 44ed5e0c7228 in /z/repo/m5 details: http://repo.m5sim.org/m5?cmd=changeset;node=44ed5e0c7228 description: orion: Make declarations match definition
diffstat: 2 files changed, 9 insertions(+), 4 deletions(-) src/mem/ruby/network/orion/SIM_power.hh | 5 +++-- src/mem/ruby/network/orion/power_utils.hh | 8 ++++++-- diffs (40 lines): diff -r 90c097fb76e1 -r 44ed5e0c7228 src/mem/ruby/network/orion/SIM_power.hh --- a/src/mem/ruby/network/orion/SIM_power.hh Sun Mar 14 20:58:45 2010 -0700 +++ b/src/mem/ruby/network/orion/SIM_power.hh Tue Mar 16 08:15:16 2010 -0700 @@ -359,7 +359,7 @@ */ /* 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 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 -r 90c097fb76e1 -r 44ed5e0c7228 src/mem/ruby/network/orion/power_utils.hh --- a/src/mem/ruby/network/orion/power_utils.hh Sun Mar 14 20:58:45 2010 -0700 +++ b/src/mem/ruby/network/orion/power_utils.hh Tue Mar 16 08:15:16 2010 -0700 @@ -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 _______________________________________________ m5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/m5-dev
