[libre-riscv-dev] [Bug 371] New: code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[libre-riscv-dev] [Bug 371] New: code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

            Bug ID: 371
           Summary: code removed by commit
                    12297566322355ce5fed2e2a5460bea54f69e79e
           Product: Libre-SOC's first SoC
           Version: unspecified
          Hardware: PC
                OS: Mac OS
            Status: CONFIRMED
          Severity: enhancement
          Priority: ---
         Component: Source Code
          Assignee: lkcl@lkcl.net
          Reporter: lkcl@lkcl.net
                CC: libre-riscv-dev@lists.libre-riscv.org
   NLnet milestone: ---

tobias, hi, you removed some code by not doing a git merge, properly,
overwriting work that i'm doing.  can you please put it back?
thanks.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

Luke Kenneth Casson Leighton <lkcl@lkcl.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Assignee|lkcl@lkcl.net               |libre-soc@platen-software.d
                   |                            |e

--- Comment #1 from Luke Kenneth Casson Leighton <lkcl@lkcl.net> ---
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

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

--- Comment #2 from Tobias Platen <libre-soc@platen-software.de> ---
done

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

--- Comment #3 from Luke Kenneth Casson Leighton <lkcl@lkcl.net> ---
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.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

Luke Kenneth Casson Leighton <lkcl@lkcl.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|CONFIRMED                   |RESOLVED
         Resolution|---                         |FIXED

--- Comment #4 from Luke Kenneth Casson Leighton <lkcl@lkcl.net> ---
(In reply to Tobias Platen from comment #2)
> done

excellent, thank you.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

--- Comment #5 from Tobias Platen <libre-soc@platen-software.de> ---
I changed my editor settings to that it that auto-detects when a file was
changed by an external program.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

Luke Kenneth Casson Leighton <lkcl@lkcl.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|FIXED                       |---
             Status|RESOLVED                    |IN_PROGRESS

--- Comment #6 from Luke Kenneth Casson Leighton <lkcl@lkcl.net> ---
(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

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

--- Comment #7 from Tobias Platen <libre-soc@platen-software.de> ---
those lines are already present in the code, at least on my local code which I
recently git pulled.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

--- Comment #8 from Luke Kenneth Casson Leighton <lkcl@lkcl.net> ---
(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)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev

[libre-riscv-dev] [Bug 371] code removed by commit 12297566322355ce5fed2e2a5460bea54f69e79e

[bugzilla-daemon]

https://bugs.libre-soc.org/show_bug.cgi?id=371

Luke Kenneth Casson Leighton <lkcl@lkcl.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|IN_PROGRESS                 |RESOLVED
         Resolution|---                         |FIXED

--- Comment #9 from Luke Kenneth Casson Leighton <lkcl@lkcl.net> ---
excellent, you found it.  closing again.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
libre-riscv-dev mailing list
libre-riscv-dev@lists.libre-riscv.org
http://lists.libre-riscv.org/mailman/listinfo/libre-riscv-dev