christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

treat AspectConfig like other configuration headers

Browse Source 
This is temporary; we need a proper configuration tool for this.
 - AspectConfig.hpp moves to config/AspectConfig.hpp.in
 - generate configuration in build tree

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@958 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-03-08 22:54:05 +00:00
parent e5fea2dbcd
commit 97534f7a19
22 changed files with 98 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/SAL/bochs/MemEvents.ah
View File

@ -2,9 +2,9 @@
#define __MEM_EVENTS_AH__
#include <iostream>
#include "../../AspectConfig.hpp"
#include "config/AspectConfig.hpp"
#if CONFIG_EVENT_MEMREAD == 1 || CONFIG_EVENT_MEMWRITE == 1
#if defined(CONFIG_EVENT_MEMREAD) || defined(CONFIG_EVENT_MEMWRITE)
#include "../../../bochs/bochs.h"
#include "../../../bochs/cpu/cpu.h"
@ -57,7 +57,7 @@ aspect MemEvents
//
// Event source: "memory write access"
//
#if CONFIG_EVENT_MEMWRITE == 1
#ifdef CONFIG_EVENT_MEMWRITE
advice execution (write_methods()) : after () {
sal::simulator.onMemoryAccessEvent(
*(tjp->arg<1>()), sizeof(*(tjp->arg<2>())), true,
@ -103,7 +103,7 @@ aspect MemEvents
//
// Event source: "memory read access"
//
#if CONFIG_EVENT_MEMREAD == 1
#ifdef CONFIG_EVENT_MEMREAD
advice execution (read_methods()) : before () {
sal::simulator.onMemoryAccessEvent(
*(tjp->arg<1>()), sizeof(*(tjp->result())), false,
@ -119,14 +119,14 @@ aspect MemEvents
advice execution (read_methods_RMW()) : before () {
rmw_address = *(tjp->arg<1>());
#if CONFIG_EVENT_MEMREAD == 1
#ifdef CONFIG_EVENT_MEMREAD
sal::simulator.onMemoryAccessEvent(
*(tjp->arg<1>()), sizeof(*(tjp->result())), false,
getCPU(tjp->that())->prev_rip);
#endif
}
#if CONFIG_EVENT_MEMREAD == 1
#ifdef CONFIG_EVENT_MEMREAD
advice execution (read_methods_system()) : before () {
// We don't do anything here for now: This type of memory
// access is used when the hardware itself needs to access