Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove obsolete div64.c

Browse source
This commit is contained in:
Michal Sieron 2021-08-10 15:01:31 +02:00
parent 8e4e3b5438
commit 823edfad22
4 changed files with 2 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
litex/soc/software/include/base/div64.h
View file

@ -1,39 +0,0 @@
#ifndef _ASM_GENERIC_DIV64_H
#define _ASM_GENERIC_DIV64_H
/*
* Copyright (C) 2003 Bernardo Innocenti <bernie@develer.com>
* Based on former asm-ppc/div64.h and asm-m68knommu/div64.h
*
* The semantics of do_div() are:
*
* uint32_t do_div(uint64_t *n, uint32_t base)
* {
* uint32_t remainder = *n % base;
* *n = *n / base;
* return remainder;
* }
*
* NOTE: macro parameter n is evaluated multiple times,
* beware of side effects!
*/
#include <stdint.h>
extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);
/* The unnecessary pointer compare is there
* to check for type safety (n must be 64bit)
*/
# define do_div(n,base) ({ \
uint32_t __base = (base); \
uint32_t __rem; \
(void)(((typeof((n)) *)0) == ((uint64_t *)0)); \
if (((n) >> 32) == 0) { \
__rem = (uint32_t)(n) % __base; \
(n) = (uint32_t)(n) / __base; \
} else \
__rem = __div64_32(&(n), __base); \
__rem; \
})
#endif /* _ASM_GENERIC_DIV64_H */

1
litex/soc/software/libbase/Makefile
View file

@ -10,7 +10,6 @@ OBJECTS = exception.o \
time.o \
spiflash.o \
i2c.o \
div64.o \
progress.o \
memtest.o \
sim_debug.o

54
litex/soc/software/libbase/div64.c
View file

@ -1,54 +0,0 @@
/*
* Copyright (C) 2003 Bernardo Innocenti <bernie@develer.com>
*
* Based on former do_div() implementation from asm-parisc/div64.h:
* Copyright (C) 1999 Hewlett-Packard Co
* Copyright (C) 1999 David Mosberger-Tang <davidm@hpl.hp.com>
*
*
* Generic C version of 64bit/32bit division and modulo, with
* 64bit result and 32bit remainder.
*
* The fast case for (n>>32 == 0) is handled inline by do_div().
*
* Code generated for this function might be very inefficient
* for some CPUs. __div64_32() can be overridden by linking arch-specific
* assembly versions such as arch/ppc/lib/div64.S and arch/sh/lib/div64.S.
*/
#include <stdint.h>
#include <base/div64.h>
uint32_t __div64_32(uint64_t *n, uint32_t base)
{
uint64_t rem = *n;
uint64_t b = base;
uint64_t res, d = 1;
uint32_t high = rem >> 32;
/* Reduce the thing a bit first */
res = 0;
if (high >= base) {
high /= base;
res = (uint64_t) high << 32;
rem -= (uint64_t) (high*base) << 32;
}
while ((int64_t)b > 0 && b < rem) {
b = b+b;
d = d+d;
}
do {
if (rem >= b) {
rem -= b;
res += d;
}
b >>= 1;
d >>= 1;
} while (d);
*n = res;
return rem;
}

5
litex/soc/software/libbase/progress.c
View file

@ -20,8 +20,8 @@
#include <base/console.h>
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <base/div64.h>
#include <base/progress.h>
#define FILESIZE_MAX 100000000
@ -42,8 +42,7 @@ void show_progress(int now)
if (progress_max && progress_max != FILESIZE_MAX) {
uint64_t tmp = (int64_t)now * HASHES_PER_LINE;
do_div(tmp, progress_max);
now = tmp;
now = lldiv(tmp, progress_max).quot;
}
while (printed < now) {