diff options
| author | luhuadong <[email protected]> | 2020-04-18 16:26:36 +0800 |
|---|---|---|
| committer | luhuadong <[email protected]> | 2020-04-18 16:26:36 +0800 |
| commit | 964cbe612adbe749b4cd3c3ef48eafe72a571254 (patch) | |
| tree | 986db99ce7838075ed578de7a68893b3bb3dd28a /components | |
| parent | 3b2fa472096d41287ee8cb542e8c1d119a5a8b76 (diff) | |
| parent | d2ff5055387a46908aa48be639b32e796e128a1c (diff) | |
Resolve conflicts
Diffstat (limited to 'components')
| -rw-r--r-- | components/finsh/finsh.h | 4 | ||||
| -rw-r--r-- | components/finsh/finsh_compiler.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/finsh/finsh.h b/components/finsh/finsh.h index eb38682c4f..7276ea7ce1 100644 --- a/components/finsh/finsh.h +++ b/components/finsh/finsh.h @@ -27,8 +27,8 @@ #define HEAP_ALIGNMENT 4 /* heap alignment */ #define FINSH_GET16(x) (*(x)) | (*((x)+1) << 8) -#define FINSH_GET32(x) (rt_uint32_t)(*(x)) | ((rt_uint32_t)*((x)+1) << 8) | \ - ((rt_uint32_t)*((x)+2) << 16) | ((rt_uint32_t)*((x)+3) << 24) +#define FINSH_GET32(x) (rt_ubase_t)(*(x)) | ((rt_ubase_t)*((x)+1) << 8) | \ + ((rt_ubase_t)*((x)+2) << 16) | ((rt_ubase_t)*((x)+3) << 24) #define FINSH_SET16(x, v) \ do \ diff --git a/components/finsh/finsh_compiler.c b/components/finsh/finsh_compiler.c index 8d33e0e567..f81409bf9a 100644 --- a/components/finsh/finsh_compiler.c +++ b/components/finsh/finsh_compiler.c @@ -191,7 +191,7 @@ static int finsh_compile(struct finsh_node* node) case FINSH_NODE_VALUE_NULL: case FINSH_NODE_VALUE_STRING: finsh_code_byte(FINSH_OP_LD_DWORD); - finsh_code_dword((uint32_t)node->value.ptr); + finsh_code_dword((rt_ubase_t)node->value.ptr); break; /* arithmetic operation */ |