From 44e91ae9004fe679103818999b3c44e5a6886630 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 20 Jan 2017 13:23:44 +0100 Subject: csource: fix STORE_BY_BITMASK in prog2c --- csource/csource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'csource') diff --git a/csource/csource.go b/csource/csource.go index 2d18e391a..316ac9297 100644 --- a/csource/csource.go +++ b/csource/csource.go @@ -202,7 +202,7 @@ loop: if bfOff == 0 && bfLen == 0 { fmt.Fprintf(w, "\tNONFAILING(*(uint%v_t*)0x%x = (uint%v_t)0x%x);\n", size*8, addr, size*8, arg) } else { - fmt.Fprintf(w, "\tNONFAILING(STORE_BY_BITMASK(uint%v_t, %v, %v, %v, %v);\n", size*8, addr, arg, bfOff, bfLen) + fmt.Fprintf(w, "\tNONFAILING(STORE_BY_BITMASK(uint%v_t, %v, %v, %v, %v));\n", size*8, addr, arg, bfOff, bfLen) } case prog.ExecArgResult: fmt.Fprintf(w, "\tNONFAILING(*(uint%v_t*)0x%x = %v);\n", size*8, addr, resultRef()) -- cgit mrf-deployment From 9d7a67da1fc226035f2db52868400394ceba20ab Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Fri, 20 Jan 2017 13:24:53 +0100 Subject: executor: fix warning regarding type cast in STORE_BY_BITMASK --- csource/common.go | 2 +- executor/common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'csource') diff --git a/csource/common.go b/csource/common.go index f253083bf..004e5bbd2 100644 --- a/csource/common.go +++ b/csource/common.go @@ -148,7 +148,7 @@ static void install_segv_handler() #define STORE_BY_BITMASK(type, addr, val, bf_off, bf_len) \ if ((bf_off) == 0 && (bf_len) == 0) { \ - *(type*)(addr) = (val); \ + *(type*)(addr) = (type)(val); \ } else { \ type new_val = *(type*)(addr); \ new_val &= ~BITMASK_LEN_OFF(type, (bf_off), (bf_len)); \ diff --git a/executor/common.h b/executor/common.h index 5c5bb1032..f2d4487a3 100644 --- a/executor/common.h +++ b/executor/common.h @@ -164,7 +164,7 @@ static void install_segv_handler() #define STORE_BY_BITMASK(type, addr, val, bf_off, bf_len) \ if ((bf_off) == 0 && (bf_len) == 0) { \ - *(type*)(addr) = (val); \ + *(type*)(addr) = (type)(val); \ } else { \ type new_val = *(type*)(addr); \ new_val &= ~BITMASK_LEN_OFF(type, (bf_off), (bf_len)); \ -- cgit mrf-deployment