Repository navigation
Style follow-up: localparams, named constants, dead code, typo renames, consistent nesting - #1959
Open
davidharrishmc wants to merge 19 commits into
Open
davidharrishmc wants to merge 19 commits into
davidharrishmc wants to merge 19 commits into
Conversation
Fix spelling, grammar, and wrong or garbled comments; normalize indentation and operator spacing; and add short comments explaining hard-to-follow control-bit logic, especially in the FPU. Code tokens are unchanged. Delete eight modules that are never instantiated. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…dh/sv-cosmetics Resolve the src/cache/cache.sv conflict by taking openhwfoundation#1948's code (OFFSETLEN and SETLEN as parameters, NextSet sized OFFSETLEN+SETLEN) and keeping this branch's comment/whitespace cleanup. The NextSet comment no longer says "lower 12 bits", and the new localparams openhwfoundation#1948 added to ifu.sv and lsu.sv get aligned comments. After stripping comments and whitespace, every src/ file still matches main. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: David Harris <David_Harris@hmc.edu>
Restore fdivsqrtuslc4, prioritythermometer, ram2p1r1wbe_128x64 and ram2p1r1wbe_2048x64 as they are on main, and put the two RAMs back in run_vcs's list of memories generated per FPGA target. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Signed-off-by: David Harris <David_Harris@hmc.edu>
Revert capitalization-only, punctuation-only, and no-gain rewording edits, restore contributors' informal notes, and keep commented-out code such as the rom1p1r bootloader initialization and the RAM preload blocks. Spelling fixes, corrections to wrong comments, added explanatory comments, and whitespace consistency stay. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Keep alternate designs, the ROM bootloader initialization, and optimization notes; drop superseded one-liners, dead predictor flops, and blocks that reference signals that no longer exist. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Add a definition comment to the 1,430 ports that lacked one and make comments for the same signal consistent across modules, keeping a module-specific comment only where the name means something different. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Cosmetic and structural cleanup on top of the port-comment work, with no intended change in behavior. - `define -> localparam: CTRLW, BMUCTRLW, FCTRLW, INSTR_CLASS_PRED and the PLIC context count become localparams, and control-word literals use sized 24'b/21'b/14'b constants. - Named constants: P.*_FMT case labels in the FPU, RM_* rounding modes, POSTPROC_* postprocessor selects, RESULTSRC_* encodings, CMO_* cbo bit positions, ICLASS_* and REGION_* one-hot bit positions, KILOPAGE.. PETAPAGE page types, compressed-opcode and SIZE_* masks, SINT_MASK. Package-level constants sit inside a lint_off UNUSEDPARAM block. - Dead-code removal: unused signals, ports and flops (e.g. fdivsqrt un, NegQuotM, AZeroE, ZeM, zknde32 round, unused SDC/HPTW delays). - Typo renames: SelecteDirty, HPTWAccesFaultReg, WordAdrrMux, RestorMux, presresultmux, ADDR_WDITH, ziccslm_align, SelectedWiteWordEn tag; LeftShiftQm -> RightShiftQm; else-branch generate blocks get no* names so they no longer duplicate the active branch's name. - 2-space nesting and whitespace alignment. - Dedup: unpackinput exponent re-bias, flags ShiftGtIntSz, fhazard forwarding, aes64ks1i result, rev8 via byteop. - CLINT and UART register offsets use their named constants. - sim/questa/coverage-exclusions-rv64gc.do tracks the renamed exclusion tag, and examples/exercises/7p12/buga.sh edits the CTRLW localparam. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Conflicts were main's logic changes in lines this branch re-indented or re-commented; each keeps main's code with this branch's formatting: - fdivsqrtfsm.sv, div.sv: FlushE & ~StallM (openhwfoundation#1925) and its comment; the fdivsqrtfsm DONE-state exclusion tag stays removed - controller.sv: sfence.inval.ir refetch (openhwfoundation#1929) - tlbcamline.sv: TLBWrite/WritePTE_G/WritePTE_NAPOT ports (openhwfoundation#1927) - tlbcontrol.sv: ~UpperBitsUnequal in TLBMiss (openhwfoundation#1928), new BadNAPOT comment - csrc.sv: time/timeh read only with Zicntr (openhwfoundation#1951) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: David Harris <David_Harris@hmc.edu>
Comment the ports main added: hptw ENVCFG_PBMTE, and TLBWrite, WritePTE_G and WritePTE_NAPOT in tlbcam and tlbcamline (one per line). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: David Harris <David_Harris@hmc.edu>
Keep main's Match0Upper factoring (shared with Overlap) and its Zicntr gating of time/timeh, with this branch's KILOPAGE constant and spacing; use KILOPAGE in the new Overlap term too. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: David Harris <David_Harris@hmc.edu>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: David Harris <David_Harris@hmc.edu>
Contributor
Author
|
Review notes: every logic-text change is value-identical or removes dead logic, and today's main merge kept main's new code. The body needs a few corrections:
🤖 Generated with Claude Code |
# Conflicts: # src/hazard/hazard.sv # src/privileged/csr.sv # src/privileged/privdec.sv
This was referenced Oct 16, 2026
Contributor
Author
|
Merge order: this is part of the cosmetic stack, merged strictly #1952 → #1955 → #1959 so each delta shows on its own. Merge the open bug-fix PRs first: #1949, #1958, #1967, #1969, #1972, #1982, #1986 and #1987. The stack conflicts textually with them, and re-applying formatting is easier than re-applying fixes. 🤖 Generated with Claude Code |
# Conflicts: # src/hazard/hazard.sv # src/mmu/hptw.sv # src/privileged/csr.sv # src/privileged/csrc.sv # src/privileged/privdec.sv # src/privileged/privileged.sv # src/privileged/trap.sv
LSUHREADY = HREADY & ~LSUDisable, and the arbiter sets LSUDisable while the IFU holds the bus, so the port comment saying it is never gated was wrong. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # src/hazard/hazard.sv # src/lsu/lsu.sv
… address table NAPOT4 compared HitPageType with a literal 3'b000 where the rest of the TLB uses the page-type constants. csrindextoaddr's address table has 36 entries while TOTAL_CSRS is a parameter, so a larger TOTAL_CSRS would index past the table; stop elaboration with an error instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Contributor
Author
|
Updated per review:
🤖 Generated with Claude Code |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Builds on #1955 (which builds on #1952); merge those first so this PR shows only its own changes.
`define→localparamfor local widths (FCTRLW,CTRLW,BMUCTRLW, plicC). Decode-table literals now carry explicit widths (14'b/24'b/21'b) since a parameter cannot size a literal.INSTR_CLASS_PREDstays a`definein bpred.sv; Use P.INSTR_CLASS_PRED in bpred #1967 replaces it withP.INSTR_CLASS_PRED. Shared config macros (`BP_*) stay.P.*_FMT; new package constants for page types, CMO bits, instruction classes, PMA regions, postprocessor selects, and rounding modes; existingUART_*/CLINT_*register names;RESULTSRC_*.zknde32roundport, the unreferencedmux6/mux7modules, and the deadZeMbits of the FPU'sEMFpReg4pipeline register (nowP.NF+1bits wide).WordAdrrMux,SelecteDirty,HPTWAccesFaultReg,ADDR_WDITH,CacheBusHPWTStall,ziccslm_align,Div0eMReg,RestorMux,presresultmux,LeftShiftQm→RightShiftQm), updating the coverage-exclusion tag, and the placeholder macro name inrom1p1r_128x32(generic64x128ROM→generic128x32ROM, matching the file).flushlogic→noflushlogic,bpred→nobpred,decomp→nodecomp,cboz→nocboz,tlb→notlb). These hierarchical paths change; nothing in the repo refers to them, but external wave or ILA scripts would need updating.csrindextoaddrlooks addresses up in a table instead of a one-hotcase, and stops elaboration ifTOTAL_CSRSexceeds the table.ShiftGtIntSz, fhazard's forwarding blocks, aes64ks1i, and rev8 viabyteop.import cvw::*; #(, port alignment).🤖 Generated with Claude Code