| Summary: | code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e | ||
|---|---|---|---|
| Product: | Libre-SOC's first SoC | Reporter: | Luke Kenneth Casson Leighton <lkcl> |
| Component: | Source Code | Assignee: | Tobias Platen <libre-soc> |
| Status: | RESOLVED FIXED | ||
| Severity: | enhancement | CC: | libre-soc-bugs |
| Priority: | --- | ||
| Version: | unspecified | ||
| Hardware: | PC | ||
| OS: | Mac OS | ||
| NLnet milestone: | --- | total budget (EUR) for completion of task and all subtasks: | 0 |
| budget (EUR) for this task, excluding subtasks' budget: | 0 | parent task for budget allocation: | |
| child tasks for budget allocation: | The table of payments (in EUR) for this task; TOML format: | ||
|
Description
Luke Kenneth Casson Leighton
2020-06-09 13:48:25 BST
commit 12297566322355ce5fed2e2a5460bea54f69e79e Author: Tobias Platen <tplaten@posteo.de> Date: Tue Jun 9 14:00:50 2020 +0200 fixes for DualPortSplitter @@ -307,19 +308,11 @@ class L0CacheBuffer(Elaboratable): def __init__(self, n_units, mem, regwid=64, addrwid=48): self.n_units = n_units self.mem = mem - self.regwid = regwid - self.addrwid = addrwid ul = [] for i in range(n_units): ul.append(LDSTPort(i, regwid, addrwid)) self.dports = Array(ul) - def truncaddr(self, addr): - """truncates the address to the top bits of the memory granularity - """ - nbits = log2_int(self.mem.regwid) - return addr[nbits:] - def elaborate(self, plat done the procedure that should be used is: * edit and save * git diff (to check and review the current status of work in progress) * git commit * git pull * git push * *RELOAD* all editor windows (or use an editor that auto-detects) the process that you used, we may deduce that it was: * edit and save * git pull * re-save local file WITHOUT CHECKING * git commit * git push can you please: 1) adjust working practices to the first process 2) restore the erased code 3) close this bugreport when done thanks. (In reply to Tobias Platen from comment #2) > done excellent, thank you. I changed my editor settings to that it that auto-detects when a file was changed by an external program. (In reply to Tobias Platen from comment #5) > I changed my editor settings to that it that auto-detects when a file was > changed by an external program. great. can you also restore this: class DataMergerRecord(Record): """ {data: 128 bit, byte_enable: 16 bit} """ def __init__(self, name=None): layout = (('data', 128), ('en', 16)) Record.__init__(self, Layout(layout), name=name) #FIXME: make resetless those lines are already present in the code, at least on my local code which I recently git pulled. (In reply to Tobias Platen from comment #7) > those lines are already present in the code, at least on my local code which > I recently git pulled. yes. which means that you overwrote some code which is *not* present. can you please carefully examine the commit and restore all of the code. also, i am reverting the recent commit because it does not work. from soc.scoreboard.addr_split import LDSTSplitter ImportError: cannot import name 'LDSTSplitter' from 'soc.scoreboard.addr_split' (/home/lkcl/src/libresoc/soc/src/soc/scoreboard/addr_split.py) excellent, you found it. closing again. |