software/videomixer: fix overflow in memory bandwidth computation

m-labs · Jul 14, 2013 · 2f662bf · 2f662bf
1 parent f3e07db
commit 2f662bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/software/libcompiler-rt/Makefile b/software/libcompiler-rt/Makefile
@@ -5,7 +5,7 @@ CFLAGS+=-D_YUGA_LITTLE_ENDIAN=0 -D_YUGA_BIG_ENDIAN=1 -Wno-missing-prototypes
 
 OBJECTS=divsi3.o modsi3.o comparedf2.o negsf2.o negdf2.o addsf3.o subsf3.o mulsf3.o divsf3.o lshrdi3.o muldi3.o divdi3.o ashldi3.o ashrdi3.o udivmoddi4.o \
   floatsisf.o floatunsisf.o fixsfsi.o fixunssfsi.o adddf3.o subdf3.o muldf3.o divdf3.o floatsidf.o floatunsidf.o floatdidf.o fixdfsi.o fixunsdfsi.o \
-  clzsi2.o ctzsi2.o
+  clzsi2.o ctzsi2.o udivdi3.o
 
 all: libcompiler-rt.a
 

diff --git a/software/videomixer/main.c b/software/videomixer/main.c
@@ -102,9 +102,9 @@ static void membw_service(void)
 		nr = lasmicon_bandwidth_nreads_read();
 		nw = lasmicon_bandwidth_nwrites_read();
 		f = identifier_frequency_read();
-		rdb = nr*f >> (24 - 7);
-		wrb = nw*f >> (24 - 7);
-		printf("read:%4dMbps  write:%4dMbps  all:%4dMbps\n", rdb/1000000, wrb/1000000, (rdb + wrb)/1000000);
+		rdb = (nr*f >> (24 - 7))/1000000ULL;
+		wrb = (nw*f >> (24 - 7))/1000000ULL;
+		printf("read:%5dMbps  write:%5dMbps  all:%5dMbps\n", rdb, wrb, rdb + wrb);
 	}
 }