Browse Source

Merge remote-tracking branch 'origin/develop' into develop

Eyck Jentzsch 1 year ago
parent
commit
96700d00f9
3 changed files with 4 additions and 3 deletions
  1. 2
    1
      .project
  2. 1
    1
      etc/dbt-riscv Debug hello gdb.launch
  3. 1
    1
      etc/dbt-riscv SC Debug hello.launch

+ 2
- 1
.project View File

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <projectDescription>
3
-	<name>dbt-riscv</name>
3
+	<name>DBT-RISE-RISCV</name>
4 4
 	<comment></comment>
5 5
 	<projects>
6 6
 	</projects>
@@ -23,5 +23,6 @@
23 23
 		<nature>org.eclipse.cdt.core.ccnature</nature>
24 24
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
25 25
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
26
+		<nature>org.eclipse.linuxtools.tmf.project.nature</nature>
26 27
 	</natures>
27 28
 </projectDescription>

+ 1
- 1
etc/dbt-riscv Debug hello gdb.launch View File

@@ -19,7 +19,7 @@
19 19
 <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
20 20
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="main"/>
21 21
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-v4&#10;-g10000&#10;${project_loc:hello}/hello"/>
22
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="/home/eyck/git/DBT-RISE-RISCV/build/Debug/bin/riscv"/>
22
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/Debug/riscv/bin/riscv"/>
23 23
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="DBT-RISE-RISCV"/>
24 24
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
25 25
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>

+ 1
- 1
etc/dbt-riscv SC Debug hello.launch View File

@@ -19,7 +19,7 @@
19 19
 <booleanAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN" value="true"/>
20 20
 <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_STOP_AT_MAIN_SYMBOL" value="sc_main"/>
21 21
 <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_ARGUMENTS" value="-v5&#10;-c simple-system.json&#10;-l ${project_loc:hello}/hello"/>
22
-<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="/home/eyck/git/DBT-RISE-RISCV/build/Debug/bin/riscv.sc"/>
22
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="build/Debug/bin/riscv.sc"/>
23 23
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="DBT-RISE-RISCV"/>
24 24
 <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
25 25
 <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/>