tlb.hh (5086:e7913ffb379d) tlb.hh (5118:f1b1cb6d0fbe)
1/*
2 * Copyright (c) 2007 The Hewlett-Packard Development Company
3 * All rights reserved.
4 *
5 * Redistribution and use of this software in source and binary forms,
6 * with or without modification, are permitted provided that the
7 * following conditions are met:
8 *

--- 48 unchanged lines hidden (view full) ---

57
58#ifndef __ARCH_X86_TLB_HH__
59#define __ARCH_X86_TLB_HH__
60
61#include "config/full_system.hh"
62
63#if FULL_SYSTEM
64
1/*
2 * Copyright (c) 2007 The Hewlett-Packard Development Company
3 * All rights reserved.
4 *
5 * Redistribution and use of this software in source and binary forms,
6 * with or without modification, are permitted provided that the
7 * following conditions are met:
8 *

--- 48 unchanged lines hidden (view full) ---

57
58#ifndef __ARCH_X86_TLB_HH__
59#define __ARCH_X86_TLB_HH__
60
61#include "config/full_system.hh"
62
63#if FULL_SYSTEM
64
65#include "arch/segmentregs.hh"
65#include "mem/request.hh"
66#include "params/X86DTB.hh"
67#include "params/X86ITB.hh"
68#include "sim/faults.hh"
69#include "sim/sim_object.hh"
70
71class ThreadContext;
72class Packet;
73
74namespace X86ISA
75{
66#include "mem/request.hh"
67#include "params/X86DTB.hh"
68#include "params/X86ITB.hh"
69#include "sim/faults.hh"
70#include "sim/sim_object.hh"
71
72class ThreadContext;
73class Packet;
74
75namespace X86ISA
76{
77 static const unsigned StoreCheck = 1 << NUM_SEGMENTREGS;
78
76 struct TlbEntry
77 {
78 Addr pageStart;
79 TlbEntry() {}
80 TlbEntry(Addr paddr) : pageStart(paddr) {}
81
82 void serialize(std::ostream &os);
83 void unserialize(Checkpoint *cp, const std::string &section);

--- 45 unchanged lines hidden (view full) ---

129};
130
131}
132
133#else
134
135#include <iostream>
136
79 struct TlbEntry
80 {
81 Addr pageStart;
82 TlbEntry() {}
83 TlbEntry(Addr paddr) : pageStart(paddr) {}
84
85 void serialize(std::ostream &os);
86 void unserialize(Checkpoint *cp, const std::string &section);

--- 45 unchanged lines hidden (view full) ---

132};
133
134}
135
136#else
137
138#include <iostream>
139
140#include "arch/x86/segmentregs.hh"
137#include "sim/host.hh"
138#include "sim/tlb.hh"
139
140class Checkpoint;
141
142namespace X86ISA
143{
141#include "sim/host.hh"
142#include "sim/tlb.hh"
143
144class Checkpoint;
145
146namespace X86ISA
147{
148 static const unsigned StoreCheck = 1 << NUM_SEGMENTREGS;
149
144 struct TlbEntry
145 {
146 Addr pageStart;
147 TlbEntry() {}
148 TlbEntry(Addr paddr) : pageStart(paddr) {}
149
150 void serialize(std::ostream &os);
151 void unserialize(Checkpoint *cp, const std::string &section);

--- 20 unchanged lines hidden --- 		150 struct TlbEntry
151 {
152 Addr pageStart;
153 TlbEntry() {}
154 TlbEntry(Addr paddr) : pageStart(paddr) {}
155
156 void serialize(std::ostream &os);
157 void unserialize(Checkpoint *cp, const std::string &section);

--- 20 unchanged lines hidden ---