Skip to content

Commit dcf4c04

Browse files
authored
Merge pull request #1 from Minres/develop
Update main
2 parents 7b7648d + 9f22381 commit dcf4c04

39 files changed

+1564
-470
lines changed

.cproject

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</inputType>
7373
</tool>
7474
<tool id="cdt.managedbuild.tool.gnu.assembler.base.1444789864" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
75-
<option id="gnu.both.asm.option.include.paths.431492963" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"/>
75+
<option id="gnu.both.asm.option.include.paths.431492963" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
7676
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.463921398" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
7777
</tool>
7878
</toolChain>
@@ -155,7 +155,7 @@
155155
</inputType>
156156
</tool>
157157
<tool id="cdt.managedbuild.tool.gnu.assembler.base.1511882711" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
158-
<option id="gnu.both.asm.option.include.paths.905852970" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"/>
158+
<option id="gnu.both.asm.option.include.paths.905852970" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
159159
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1565549569" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
160160
</tool>
161161
</toolChain>

.gitignore

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,27 @@
66
/avr-gdb.cmd
77
/main.cpp
88
/Debug/
9-
/Reelease/
109
/core
1110
/*.launch
1211
/*.csv
1312
/Release/
1413
/*.vcd
1514
/*.ods
16-
/build/
15+
/build*/
1716
/*.logs
1817
language.settings.xml
1918
/*.gtkw
2019
/Debug wo LLVM/
21-
/atmega.txdb
22-
/atmega.txlgz
23-
/atmega.txlog
20+
/*.txdb
21+
/*.txlgz
22+
/*.txlog
2423
/.??*bdb.d.0
2524
/.??*bdb.i.0
2625
/.??*bdb.t
2726
/tmp/
28-
/test1.elf
27+
/*.elf
2928
/logs/
3029
/*.log
3130
/.gdbinit
3231
/*.out
33-
/*.txlog
32+
/dump.json

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ DBT-RISE-RiscV uses libGIS (https://github.com/vsergeev/libGIS) as well as ELFIO
1212

1313
**What's missing**
1414

15-
* RV64I is only preliminary verified
16-
* F & D standard extensions to be implemented
15+
* F & D standard extensions for 32bit to be implemented
16+
* MACF &D standard extensions for 64bit to be implemented and verified
1717

1818
**Planned features**
1919

dbt-core

html/ws.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
pre { margin-top:0; margin-bottom:0;}
1212
.term { background-color:black; color:white; font-weight:bold;padding-top:10px; padding-bottom:10px; max-height:400px; overflow: scroll;}
1313
span.timestamp { font-family: monospace; white-space: pre;width: 50px;}
14+
span.value_z { background-color: darkblue;}
1415
span.value_1 { background-color: green;}
15-
span.value_0 { background-color: blue;}
16+
span.value_0 { background-color: yellow;}
1617
span.value_x { background-color: red;}
1718
</style>
1819
</head>

riscv.sc/incl/sysc/SiFive/aon.h

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
1-
/*******************************************************************************
2-
* Copyright 2017 eyck@minres.com
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5-
* use this file except in compliance with the License. You may obtain a copy
6-
* of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13-
* License for the specific language governing permissions and limitations under
14-
* the License.
15-
******************************************************************************/
1+
////////////////////////////////////////////////////////////////////////////////
2+
// Copyright (C) 2017, MINRES Technologies GmbH
3+
// All rights reserved.
4+
//
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are met:
7+
//
8+
// 1. Redistributions of source code must retain the above copyright notice,
9+
// this list of conditions and the following disclaimer.
10+
//
11+
// 2. Redistributions in binary form must reproduce the above copyright notice,
12+
// this list of conditions and the following disclaimer in the documentation
13+
// and/or other materials provided with the distribution.
14+
//
15+
// 3. Neither the name of the copyright holder nor the names of its contributors
16+
// may be used to endorse or promote products derived from this software
17+
// without specific prior written permission.
18+
//
19+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22+
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23+
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24+
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25+
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26+
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27+
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28+
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29+
// POSSIBILITY OF SUCH DAMAGE.
30+
//
31+
// Contributors:
32+
// eyck@minres.com - initial implementation
33+
//
34+
//
35+
////////////////////////////////////////////////////////////////////////////////
1636

1737
#ifndef _AON_H_
1838
#define _AON_H_

riscv.sc/incl/sysc/SiFive/clint.h

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
1-
/*******************************************************************************
2-
* Copyright 2017 eyck@minres.com
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5-
* use this file except in compliance with the License. You may obtain a copy
6-
* of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13-
* License for the specific language governing permissions and limitations under
14-
* the License.
15-
******************************************************************************/
1+
////////////////////////////////////////////////////////////////////////////////
2+
// Copyright (C) 2017, MINRES Technologies GmbH
3+
// All rights reserved.
4+
//
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are met:
7+
//
8+
// 1. Redistributions of source code must retain the above copyright notice,
9+
// this list of conditions and the following disclaimer.
10+
//
11+
// 2. Redistributions in binary form must reproduce the above copyright notice,
12+
// this list of conditions and the following disclaimer in the documentation
13+
// and/or other materials provided with the distribution.
14+
//
15+
// 3. Neither the name of the copyright holder nor the names of its contributors
16+
// may be used to endorse or promote products derived from this software
17+
// without specific prior written permission.
18+
//
19+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22+
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23+
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24+
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25+
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26+
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27+
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28+
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29+
// POSSIBILITY OF SUCH DAMAGE.
30+
//
31+
// Contributors:
32+
// eyck@minres.com - initial implementation
33+
//
34+
//
35+
////////////////////////////////////////////////////////////////////////////////
1636

1737
#ifndef _CLINT_H_
1838
#define _CLINT_H_

riscv.sc/incl/sysc/SiFive/core_complex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
// POSSIBILITY OF SUCH DAMAGE.
3030
//
3131
// Contributors:
32-
// eyck@minres.com - initial API and implementation
32+
// eyck@minres.com - initial implementation
3333
//
3434
//
3535
////////////////////////////////////////////////////////////////////////////////

riscv.sc/incl/sysc/SiFive/gpio.h

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,44 @@
1-
/*******************************************************************************
2-
* Copyright 2017 eyck@minres.com
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5-
* use this file except in compliance with the License. You may obtain a copy
6-
* of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13-
* License for the specific language governing permissions and limitations under
14-
* the License.
15-
******************************************************************************/
1+
////////////////////////////////////////////////////////////////////////////////
2+
// Copyright (C) 2017, MINRES Technologies GmbH
3+
// All rights reserved.
4+
//
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are met:
7+
//
8+
// 1. Redistributions of source code must retain the above copyright notice,
9+
// this list of conditions and the following disclaimer.
10+
//
11+
// 2. Redistributions in binary form must reproduce the above copyright notice,
12+
// this list of conditions and the following disclaimer in the documentation
13+
// and/or other materials provided with the distribution.
14+
//
15+
// 3. Neither the name of the copyright holder nor the names of its contributors
16+
// may be used to endorse or promote products derived from this software
17+
// without specific prior written permission.
18+
//
19+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22+
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23+
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24+
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25+
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26+
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27+
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28+
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29+
// POSSIBILITY OF SUCH DAMAGE.
30+
//
31+
// Contributors:
32+
// eyck@minres.com - initial implementation
33+
//
34+
//
35+
////////////////////////////////////////////////////////////////////////////////
1636

1737
#ifndef _GPIO_H_
1838
#define _GPIO_H_
1939

2040
#include "scc/tlm_target.h"
41+
#include "scc/ext_attribute.h"
2142
#include <sysc/communication/sc_signal_rv_ports.h>
2243

2344
namespace sysc {
@@ -35,11 +56,13 @@ class gpio : public sc_core::sc_module, public scc::tlm_target<> {
3556
gpio(sc_core::sc_module_name nm);
3657
virtual ~gpio() override; // need to keep it in source file because of fwd declaration of gpio_regs
3758

59+
scc::ext_attribute<bool> write_to_ws;
3860
protected:
3961
void clock_cb();
4062
void reset_cb();
4163
void update_pins();
4264
void pins_cb();
65+
void before_end_of_elaboration();
4366
sc_core::sc_time clk;
4467
std::unique_ptr<gpio_regs> regs;
4568
std::shared_ptr<sysc::WsHandler> handler;

riscv.sc/incl/sysc/SiFive/platform.h

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,38 @@
1-
/*******************************************************************************
2-
* Copyright 2017 eyck@minres.com
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5-
* use this file except in compliance with the License. You may obtain a copy
6-
* of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13-
* License for the specific language governing permissions and limitations under
14-
* the License.
15-
******************************************************************************/
16-
/*
17-
* simplesystem.h
18-
*
19-
* Created on: 17.09.2017
20-
* Author: eyck@minres.com
21-
*/
1+
////////////////////////////////////////////////////////////////////////////////
2+
// Copyright (C) 2017, MINRES Technologies GmbH
3+
// All rights reserved.
4+
//
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are met:
7+
//
8+
// 1. Redistributions of source code must retain the above copyright notice,
9+
// this list of conditions and the following disclaimer.
10+
//
11+
// 2. Redistributions in binary form must reproduce the above copyright notice,
12+
// this list of conditions and the following disclaimer in the documentation
13+
// and/or other materials provided with the distribution.
14+
//
15+
// 3. Neither the name of the copyright holder nor the names of its contributors
16+
// may be used to endorse or promote products derived from this software
17+
// without specific prior written permission.
18+
//
19+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22+
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23+
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24+
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25+
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26+
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27+
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28+
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29+
// POSSIBILITY OF SUCH DAMAGE.
30+
//
31+
// Contributors:
32+
// eyck@minres.com - initial implementation
33+
//
34+
//
35+
////////////////////////////////////////////////////////////////////////////////
2236

2337
#ifndef SIMPLESYSTEM_H_
2438
#define SIMPLESYSTEM_H_

0 commit comments

Comments
 (0)