christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

SALConfig.hpp simplified (#if).

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1210 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-05-09 09:14:42 +00:00
parent 5eeda5a2a6
commit 08c8b05b96
1 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
core/SAL/SALConfig.hpp
View File

@ -1,45 +1,29 @@
#ifndef __SAL_CONFIG_HPP__ #ifndef __SAL_CONFIG_HPP__
#define __SAL_CONFIG_HPP__ #define __SAL_CONFIG_HPP__
#include <stdint.h> #include <stdint.h>
#include "config/variant_config.hpp" #include "config/variant_config.hpp"
// Type-config depends on the current selected simulator:
#if defined BUILD_BOCHS #if defined BUILD_BOCHS
#include "bochs/BochsConfig.hpp"
#include "bochs/BochsConfig.hpp" // current simulator config
namespace sal
{
typedef guest_address_t address_t; //!< common address type to be used in experiment flows
typedef uint8_t byte_t; //!< 8 bit type for memory access (read or write)
typedef uint32_t regwidth_t; //!< type of register width [bits]
typedef register_data_t regdata_t; //!< type of register data
extern const address_t ADDR_INV; //!< invalid address flag (defined in Memory.cc)
}
#elif defined BUILD_OVP #elif defined BUILD_OVP
#include "ovp/OVPConfig.hpp"
#include "ovp/OVPConfig.hpp" // current simulator config
namespace sal
{
typedef guest_address_t address_t; //!< common address type to be used in experiment flows
typedef uint8_t byte_t; //!< 8 bit type for memory access (read or write)
typedef uint32_t regwidth_t; //!< type of register width [bits]
typedef register_data_t regdata_t; //!< type of register data
extern const address_t ADDR_INV; //!< invalid address flag (defined in Memory.cc)
}
#else #else
#error SAL Config Target not defined #error SAL Config Target not defined
#endif #endif
namespace sal
{
typedef guest_address_t address_t; //!< common address type to be used in experiment flows
typedef uint8_t byte_t; //!< 8 bit type for memory access (read or write)
typedef uint32_t regwidth_t; //!< type of register width [bits]
typedef register_data_t regdata_t; //!< type of register data
typedef timer_t timer_id_t; //!< type of timer IDs
extern const address_t ADDR_INV; //!< invalid address flag (defined in Memory.cc)
}
#endif // __SAL_CONFIG_HPP__ #endif // __SAL_CONFIG_HPP__