Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a69460214181
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c88ec08f38a
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 18, 2017

  1. Copy the full SHA
    e8ebb04 View commit details
  2. Copy the full SHA
    2c88ec0 View commit details
Showing with 4 additions and 2 deletions.
  1. +1 −1 misoc/cores/timer.py
  2. +2 −0 misoc/software/{liballoc → include}/alloc.h
  3. +1 −1 misoc/software/liballoc/alloc.c
2 changes: 1 addition & 1 deletion misoc/cores/timer.py
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@


class Timer(Module, AutoCSR):
def __init__(self, width=32):
def __init__(self, width=64):
self._load = CSRStorage(width)
self._reload = CSRStorage(width)
self._en = CSRStorage()
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef _ALLOC_H
#define _ALLOC_H

#include <stddef.h>

void alloc_give(void *addr, size_t size);
void alloc_show(void);

2 changes: 1 addition & 1 deletion misoc/software/liballoc/alloc.c
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
#include "alloc.h"
#include <alloc.h>

struct meta {
uintptr_t magi;