christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Fixes to compile OVP platform + bugfix in statreg

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1144 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
sirozipp
2012-04-23 14:54:08 +00:00
parent 8053233897
commit d93cf513f5
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ovp/cortexM3/CMakeLists.txt
View File

@ -12,4 +12,4 @@ add_dependencies(ovp_cortexM3 protomessages )
target_link_libraries(ovp_cortexM3 ${SIM_LDFLAGS} SAL controller jobserver util )
## OVP links all needed shared libraries via a runtimeloader
set_target_properties(ovp_cortexM3 PROPERTIES LINK_FLAGS "-L${CMAKE_BINARY_DIR}/lib -lfail -lpcl -m32 ")
set_target_properties(ovp_cortexM3 PROPERTIES LINK_FLAGS "-L${CMAKE_BINARY_DIR}/lib -lpcl -m32 ")

2
ovp/cortexM3/platform/platform.cc
View File

@ -356,7 +356,7 @@ int main(int argc, char **argv) {
arm.makeSTRegister();
arm.makePCRegister();
sal::simulator.finishedRegisterCreation();
// sal::simulator.finishedRegisterCreation();
arm.startSimulation(argv[1]);
}

2
ovp/cortexM3/platform/statreg.hpp
View File

@ -53,6 +53,8 @@ class CortexM3StatusRegister : public OVPStatusRegister {
// OR with 0x00010000 (e.g.)
val = val | bit;
}
icmWriteRegInfoValue(cpuP, cpsr, (void *)&val);
}
bool getSignFlag() const {