From 08ecead971a742e0012aefab7d22bfe5f1b644bd Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 21 Oct 2023 17:26:51 +0200 Subject: [PATCH] updates submodules and does some cleanup if directory structure --- .clang-format | 96 ++++ .../FW-Debug.launch | 0 .../TGC-VP interp dhrystone.launch | 0 .../TGC-VP interp hello.launch | 0 .../TGC-VP tcc dhrystone.launch | 0 .../TGC-VP tcc hello.launch | 0 .../TGC-VP with pctrace.launch | 0 .../TGC-VP-FW-Debug.launch | 0 .../TGC-VP-GDBServer.launch | 0 contrib/TGC5C_instr.yaml | 532 ------------------ tgc-iss/dbt-rise-tgc | 2 +- vpvper | 2 +- 12 files changed, 98 insertions(+), 534 deletions(-) create mode 100644 .clang-format rename {contrib/eclipse_launch => .launch}/FW-Debug.launch (100%) rename {contrib/eclipse_launch => .launch}/TGC-VP interp dhrystone.launch (100%) rename {contrib/eclipse_launch => .launch}/TGC-VP interp hello.launch (100%) rename {contrib/eclipse_launch => .launch}/TGC-VP tcc dhrystone.launch (100%) rename {contrib/eclipse_launch => .launch}/TGC-VP tcc hello.launch (100%) rename {contrib/eclipse_launch => .launch}/TGC-VP with pctrace.launch (100%) rename {contrib/eclipse_launch => .launch}/TGC-VP-FW-Debug.launch (100%) rename {contrib/eclipse_launch => .launch}/TGC-VP-GDBServer.launch (100%) delete mode 100644 contrib/TGC5C_instr.yaml diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..48c14b9 --- /dev/null +++ b/.clang-format @@ -0,0 +1,96 @@ +Language: Cpp +# BasedOnStyle: LLVM +# should be in line with IndentWidth +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlinesLeft: false +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: false + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Attach +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: true +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 120 +CommentPragmas: '^( IWYU pragma:| @suppress)' +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 0 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IncludeCategories: + - Regex: '^"(llvm|llvm-c|clang|clang-c)/' + Priority: 2 + - Regex: '^(<|"(gtest|isl|json)/)' + Priority: 3 + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '$' +IndentCaseLabels: false +IndentWidth: 4 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: true +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Left +ReflowComments: true +SortIncludes: true +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: Never +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 4 +UseTab: Never +... + diff --git a/contrib/eclipse_launch/FW-Debug.launch b/.launch/FW-Debug.launch similarity index 100% rename from contrib/eclipse_launch/FW-Debug.launch rename to .launch/FW-Debug.launch diff --git a/contrib/eclipse_launch/TGC-VP interp dhrystone.launch b/.launch/TGC-VP interp dhrystone.launch similarity index 100% rename from contrib/eclipse_launch/TGC-VP interp dhrystone.launch rename to .launch/TGC-VP interp dhrystone.launch diff --git a/contrib/eclipse_launch/TGC-VP interp hello.launch b/.launch/TGC-VP interp hello.launch similarity index 100% rename from contrib/eclipse_launch/TGC-VP interp hello.launch rename to .launch/TGC-VP interp hello.launch diff --git a/contrib/eclipse_launch/TGC-VP tcc dhrystone.launch b/.launch/TGC-VP tcc dhrystone.launch similarity index 100% rename from contrib/eclipse_launch/TGC-VP tcc dhrystone.launch rename to .launch/TGC-VP tcc dhrystone.launch diff --git a/contrib/eclipse_launch/TGC-VP tcc hello.launch b/.launch/TGC-VP tcc hello.launch similarity index 100% rename from contrib/eclipse_launch/TGC-VP tcc hello.launch rename to .launch/TGC-VP tcc hello.launch diff --git a/contrib/eclipse_launch/TGC-VP with pctrace.launch b/.launch/TGC-VP with pctrace.launch similarity index 100% rename from contrib/eclipse_launch/TGC-VP with pctrace.launch rename to .launch/TGC-VP with pctrace.launch diff --git a/contrib/eclipse_launch/TGC-VP-FW-Debug.launch b/.launch/TGC-VP-FW-Debug.launch similarity index 100% rename from contrib/eclipse_launch/TGC-VP-FW-Debug.launch rename to .launch/TGC-VP-FW-Debug.launch diff --git a/contrib/eclipse_launch/TGC-VP-GDBServer.launch b/.launch/TGC-VP-GDBServer.launch similarity index 100% rename from contrib/eclipse_launch/TGC-VP-GDBServer.launch rename to .launch/TGC-VP-GDBServer.launch diff --git a/contrib/TGC5C_instr.yaml b/contrib/TGC5C_instr.yaml deleted file mode 100644 index 8f14fe9..0000000 --- a/contrib/TGC5C_instr.yaml +++ /dev/null @@ -1,532 +0,0 @@ - -RV32I: - LUI: - encoding: 0b00000000000000000000000000110111 - mask: 0b00000000000000000000000001111111 - size: 32 - branch: false - delay: 1 - AUIPC: - encoding: 0b00000000000000000000000000010111 - mask: 0b00000000000000000000000001111111 - size: 32 - branch: false - delay: 1 - JAL: - encoding: 0b00000000000000000000000001101111 - mask: 0b00000000000000000000000001111111 - size: 32 - branch: true - delay: 1 - JALR: - encoding: 0b00000000000000000000000001100111 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: true - delay: [1,1] - BEQ: - encoding: 0b00000000000000000000000001100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: true - delay: [1,1] - BNE: - encoding: 0b00000000000000000001000001100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: true - delay: [1,1] - BLT: - encoding: 0b00000000000000000100000001100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: true - delay: [1,1] - BGE: - encoding: 0b00000000000000000101000001100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: true - delay: [1,1] - BLTU: - encoding: 0b00000000000000000110000001100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: true - delay: [1,1] - BGEU: - encoding: 0b00000000000000000111000001100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: true - delay: [1,1] - LB: - encoding: 0b00000000000000000000000000000011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - LH: - encoding: 0b00000000000000000001000000000011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - LW: - encoding: 0b00000000000000000010000000000011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - LBU: - encoding: 0b00000000000000000100000000000011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - LHU: - encoding: 0b00000000000000000101000000000011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - SB: - encoding: 0b00000000000000000000000000100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - SH: - encoding: 0b00000000000000000001000000100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - SW: - encoding: 0b00000000000000000010000000100011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - ADDI: - encoding: 0b00000000000000000000000000010011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - SLTI: - encoding: 0b00000000000000000010000000010011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - SLTIU: - encoding: 0b00000000000000000011000000010011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - XORI: - encoding: 0b00000000000000000100000000010011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - ORI: - encoding: 0b00000000000000000110000000010011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - ANDI: - encoding: 0b00000000000000000111000000010011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - SLLI: - encoding: 0b00000000000000000001000000010011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - SRLI: - encoding: 0b00000000000000000101000000010011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - SRAI: - encoding: 0b01000000000000000101000000010011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - ADD: - encoding: 0b00000000000000000000000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - SUB: - encoding: 0b01000000000000000000000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - SLL: - encoding: 0b00000000000000000001000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - SLT: - encoding: 0b00000000000000000010000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - SLTU: - encoding: 0b00000000000000000011000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - XOR: - encoding: 0b00000000000000000100000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - SRL: - encoding: 0b00000000000000000101000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - SRA: - encoding: 0b01000000000000000101000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - OR: - encoding: 0b00000000000000000110000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - AND: - encoding: 0b00000000000000000111000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - FENCE: - encoding: 0b00000000000000000000000000001111 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - ECALL: - encoding: 0b00000000000000000000000001110011 - mask: 0b11111111111111111111111111111111 - size: 32 - branch: false - delay: 1 - EBREAK: - encoding: 0b00000000000100000000000001110011 - mask: 0b11111111111111111111111111111111 - size: 32 - branch: false - delay: 1 - MRET: - encoding: 0b00110000001000000000000001110011 - mask: 0b11111111111111111111111111111111 - attributes: [[name:no_cont]] - size: 32 - branch: false - delay: 1 - WFI: - encoding: 0b00010000010100000000000001110011 - mask: 0b11111111111111111111111111111111 - size: 32 - branch: false - delay: 1 -Zicsr: - CSRRW: - encoding: 0b00000000000000000001000001110011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - CSRRS: - encoding: 0b00000000000000000010000001110011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - CSRRC: - encoding: 0b00000000000000000011000001110011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - CSRRWI: - encoding: 0b00000000000000000101000001110011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - CSRRSI: - encoding: 0b00000000000000000110000001110011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 - CSRRCI: - encoding: 0b00000000000000000111000001110011 - mask: 0b00000000000000000111000001111111 - size: 32 - branch: false - delay: 1 -Zifencei: - FENCE_I: - encoding: 0b00000000000000000001000000001111 - mask: 0b00000000000000000111000001111111 - attributes: [[name:flush]] - size: 32 - branch: false - delay: 1 -RV32M: - MUL: - encoding: 0b00000010000000000000000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - MULH: - encoding: 0b00000010000000000001000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - MULHSU: - encoding: 0b00000010000000000010000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - MULHU: - encoding: 0b00000010000000000011000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - DIV: - encoding: 0b00000010000000000100000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - DIVU: - encoding: 0b00000010000000000101000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - REM: - encoding: 0b00000010000000000110000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 - REMU: - encoding: 0b00000010000000000111000000110011 - mask: 0b11111110000000000111000001111111 - size: 32 - branch: false - delay: 1 -RV32IC: - C__ADDI4SPN: - encoding: 0b0000000000000000 - mask: 0b1110000000000011 - size: 16 - branch: false - delay: 1 - C__LW: - encoding: 0b0100000000000000 - mask: 0b1110000000000011 - size: 16 - branch: false - delay: 1 - C__SW: - encoding: 0b1100000000000000 - mask: 0b1110000000000011 - size: 16 - branch: false - delay: 1 - C__ADDI: - encoding: 0b0000000000000001 - mask: 0b1110000000000011 - size: 16 - branch: false - delay: 1 - C__NOP: - encoding: 0b0000000000000001 - mask: 0b1110111110000011 - size: 16 - branch: false - delay: 1 - C__JAL: - encoding: 0b0010000000000001 - mask: 0b1110000000000011 - size: 16 - branch: true - delay: 1 - C__LI: - encoding: 0b0100000000000001 - mask: 0b1110000000000011 - size: 16 - branch: false - delay: 1 - C__LUI: - encoding: 0b0110000000000001 - mask: 0b1110000000000011 - size: 16 - branch: false - delay: 1 - C__ADDI16SP: - encoding: 0b0110000100000001 - mask: 0b1110111110000011 - size: 16 - branch: false - delay: 1 - __reserved_clui: - encoding: 0b0110000000000001 - mask: 0b1111000001111111 - size: 16 - branch: false - delay: 1 - C__SRLI: - encoding: 0b1000000000000001 - mask: 0b1111110000000011 - size: 16 - branch: false - delay: 1 - C__SRAI: - encoding: 0b1000010000000001 - mask: 0b1111110000000011 - size: 16 - branch: false - delay: 1 - C__ANDI: - encoding: 0b1000100000000001 - mask: 0b1110110000000011 - size: 16 - branch: false - delay: 1 - C__SUB: - encoding: 0b1000110000000001 - mask: 0b1111110001100011 - size: 16 - branch: false - delay: 1 - C__XOR: - encoding: 0b1000110000100001 - mask: 0b1111110001100011 - size: 16 - branch: false - delay: 1 - C__OR: - encoding: 0b1000110001000001 - mask: 0b1111110001100011 - size: 16 - branch: false - delay: 1 - C__AND: - encoding: 0b1000110001100001 - mask: 0b1111110001100011 - size: 16 - branch: false - delay: 1 - C__J: - encoding: 0b1010000000000001 - mask: 0b1110000000000011 - size: 16 - branch: true - delay: 1 - C__BEQZ: - encoding: 0b1100000000000001 - mask: 0b1110000000000011 - size: 16 - branch: true - delay: [1,1] - C__BNEZ: - encoding: 0b1110000000000001 - mask: 0b1110000000000011 - size: 16 - branch: true - delay: [1,1] - C__SLLI: - encoding: 0b0000000000000010 - mask: 0b1111000000000011 - attributes: [[name:enable, value:1]] - size: 16 - branch: false - delay: 1 - C__LWSP: - encoding: 0b0100000000000010 - mask: 0b1110000000000011 - size: 16 - branch: false - delay: 1 - C__MV: - encoding: 0b1000000000000010 - mask: 0b1111000000000011 - size: 16 - branch: false - delay: 1 - C__JR: - encoding: 0b1000000000000010 - mask: 0b1111000001111111 - size: 16 - branch: true - delay: 1 - __reserved_cmv: - encoding: 0b1000000000000010 - mask: 0b1111111111111111 - size: 16 - branch: false - delay: 1 - C__ADD: - encoding: 0b1001000000000010 - mask: 0b1111000000000011 - size: 16 - branch: false - delay: 1 - C__JALR: - encoding: 0b1001000000000010 - mask: 0b1111000001111111 - size: 16 - branch: true - delay: 1 - C__EBREAK: - encoding: 0b1001000000000010 - mask: 0b1111111111111111 - size: 16 - branch: false - delay: 1 - C__SWSP: - encoding: 0b1100000000000010 - mask: 0b1110000000000011 - size: 16 - branch: false - delay: 1 - DII: - encoding: 0b0000000000000000 - mask: 0b1111111111111111 - size: 16 - branch: false - delay: 1 - diff --git a/tgc-iss/dbt-rise-tgc b/tgc-iss/dbt-rise-tgc index 74ff1d4..82c26ac 160000 --- a/tgc-iss/dbt-rise-tgc +++ b/tgc-iss/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit 74ff1d455a43d83929c28017a31f14247077dfa8 +Subproject commit 82c26acfc871c0ba82a69481f8383733ad174509 diff --git a/vpvper b/vpvper index 2a3ec57..b35f68e 160000 --- a/vpvper +++ b/vpvper @@ -1 +1 @@ -Subproject commit 2a3ec57906b8c5a1ab1cb146f214fe0b19aed564 +Subproject commit b35f68e35c2e5c254ab04008abe4fe0a279eb4d1