From 35658382e3ff25cbb42b8628c52d1bff9f976054 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Jan 2020 20:17:48 +0900 Subject: Removed explicit usage of the 'register' keyword. Signed-off-by: Michele Calgaro (cherry picked from commit 7ad464335bd12b0f701dfd029ba796c3c2493a82) --- k9decmpeg/vis.h | 14 +++++++------- k9vamps/k9requant.cpp | 4 ++-- k9vamps/k9requant.h | 4 ++-- k9vamps/k9requant2.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/k9decmpeg/vis.h b/k9decmpeg/vis.h index 2b57336..0976e4a 100644 --- a/k9decmpeg/vis.h +++ b/k9decmpeg/vis.h @@ -143,7 +143,7 @@ static inline void vis_set_gsr(unsigned int _val) { - register unsigned int val asm("g1"); + unsigned int val asm("g1"); val = _val; __asm__ __volatile__(".word 0xa7804000" @@ -165,7 +165,7 @@ static inline void vis_set_gsr(unsigned int _val) #define vis_st64_2(rs1,mem1,mem2) vis_r2m_2(std, rs1, mem1, mem2) #define vis_ldblk(mem, rd) \ -do { register void *__mem asm("g1"); \ +do { void *__mem asm("g1"); \ __mem = &(mem); \ __asm__ __volatile__(".word 0xc1985e00 | %1" \ : \ @@ -175,7 +175,7 @@ do { register void *__mem asm("g1"); \ } while (0) #define vis_stblk(rd, mem) \ -do { register void *__mem asm("g1"); \ +do { void *__mem asm("g1"); \ __mem = &(mem); \ __asm__ __volatile__(".word 0xc1b85e00 | %1" \ : \ @@ -227,7 +227,7 @@ do { register void *__mem asm("g1"); \ static inline void *vis_alignaddr(void *_ptr) { - register void *ptr asm("g1"); + void *ptr asm("g1"); ptr = _ptr; @@ -244,7 +244,7 @@ static inline void *vis_alignaddr(void *_ptr) static inline void vis_alignaddr_g0(void *_ptr) { - register void *ptr asm("g1"); + void *ptr asm("g1"); ptr = _ptr; @@ -259,7 +259,7 @@ static inline void vis_alignaddr_g0(void *_ptr) static inline void *vis_alignaddrl(void *_ptr) { - register void *ptr asm("g1"); + void *ptr asm("g1"); ptr = _ptr; @@ -276,7 +276,7 @@ static inline void *vis_alignaddrl(void *_ptr) static inline void vis_alignaddrl_g0(void *_ptr) { - register void *ptr asm("g1"); + void *ptr asm("g1"); ptr = _ptr; diff --git a/k9vamps/k9requant.cpp b/k9vamps/k9requant.cpp index 1648344..37939bc 100644 --- a/k9vamps/k9requant.cpp +++ b/k9vamps/k9requant.cpp @@ -414,10 +414,10 @@ int k9requant::increment_quant(int quant) return quant; } -int k9requant::intmax( register int x, register int y ) +int k9requant::intmax( int x, int y ) { return x < y ? y : x; } -int k9requant::intmin( register int x, register int y ) +int k9requant::intmin( int x, int y ) { return x < y ? x : y; } diff --git a/k9vamps/k9requant.h b/k9vamps/k9requant.h index 54d8d80..443c3ff 100644 --- a/k9vamps/k9requant.h +++ b/k9vamps/k9requant.h @@ -189,9 +189,9 @@ private: void flush_write_buffer(); int scale_quant(double quant ); int increment_quant(int quant); - int intmax( register int x, register int y ); + int intmax( int x, int y ); - int intmin( register int x, register int y ); + int intmin( int x, int y ); void putmbtype(int mb_type); int getNewQuant(int curQuant, int intra); diff --git a/k9vamps/k9requant2.h b/k9vamps/k9requant2.h index e568087..3b9b422 100644 --- a/k9vamps/k9requant2.h +++ b/k9vamps/k9requant2.h @@ -83,8 +83,8 @@ private: void flush_write_buffer(); int scale_quant(double quant); int increment_quant(int quant); - int intmax( register int x, register int y ); - int intmin( register int x, register int y ); + int intmax( int x, int y ); + int intmin( int x, int y ); int getNewQuant(int curQuant); int isNotEmpty(RunLevel *blk); int putAC(int run, int signed_level, int vlcformat); -- cgit v1.2.1