Commit c2efc95d45fd4c76d4650a34a2a2676b87a93ac4
1 parent
42532189
Fix monitor expressions
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3238 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
11 additions
and
11 deletions
monitor.c
@@ -1761,11 +1761,11 @@ static void next(void) | @@ -1761,11 +1761,11 @@ static void next(void) | ||
1761 | } | 1761 | } |
1762 | } | 1762 | } |
1763 | 1763 | ||
1764 | -static target_phys_addr_t expr_sum(void); | 1764 | +static int64_t expr_sum(void); |
1765 | 1765 | ||
1766 | -static target_phys_addr_t expr_unary(void) | 1766 | +static int64_t expr_unary(void) |
1767 | { | 1767 | { |
1768 | - target_phys_addr_t n; | 1768 | + int64_t n; |
1769 | char *p; | 1769 | char *p; |
1770 | int ret; | 1770 | int ret; |
1771 | 1771 | ||
@@ -1848,9 +1848,9 @@ static target_phys_addr_t expr_unary(void) | @@ -1848,9 +1848,9 @@ static target_phys_addr_t expr_unary(void) | ||
1848 | } | 1848 | } |
1849 | 1849 | ||
1850 | 1850 | ||
1851 | -static target_phys_addr_t expr_prod(void) | 1851 | +static int64_t expr_prod(void) |
1852 | { | 1852 | { |
1853 | - target_phys_addr_t val, val2; | 1853 | + int64_t val, val2; |
1854 | int op; | 1854 | int op; |
1855 | 1855 | ||
1856 | val = expr_unary(); | 1856 | val = expr_unary(); |
@@ -1879,9 +1879,9 @@ static target_phys_addr_t expr_prod(void) | @@ -1879,9 +1879,9 @@ static target_phys_addr_t expr_prod(void) | ||
1879 | return val; | 1879 | return val; |
1880 | } | 1880 | } |
1881 | 1881 | ||
1882 | -static target_phys_addr_t expr_logic(void) | 1882 | +static int64_t expr_logic(void) |
1883 | { | 1883 | { |
1884 | - target_phys_addr_t val, val2; | 1884 | + int64_t val, val2; |
1885 | int op; | 1885 | int op; |
1886 | 1886 | ||
1887 | val = expr_prod(); | 1887 | val = expr_prod(); |
@@ -1907,9 +1907,9 @@ static target_phys_addr_t expr_logic(void) | @@ -1907,9 +1907,9 @@ static target_phys_addr_t expr_logic(void) | ||
1907 | return val; | 1907 | return val; |
1908 | } | 1908 | } |
1909 | 1909 | ||
1910 | -static target_phys_addr_t expr_sum(void) | 1910 | +static int64_t expr_sum(void) |
1911 | { | 1911 | { |
1912 | - target_phys_addr_t val, val2; | 1912 | + int64_t val, val2; |
1913 | int op; | 1913 | int op; |
1914 | 1914 | ||
1915 | val = expr_logic(); | 1915 | val = expr_logic(); |
@@ -1927,7 +1927,7 @@ static target_phys_addr_t expr_sum(void) | @@ -1927,7 +1927,7 @@ static target_phys_addr_t expr_sum(void) | ||
1927 | return val; | 1927 | return val; |
1928 | } | 1928 | } |
1929 | 1929 | ||
1930 | -static int get_expr(target_phys_addr_t *pval, const char **pp) | 1930 | +static int get_expr(int64_t *pval, const char **pp) |
1931 | { | 1931 | { |
1932 | pch = *pp; | 1932 | pch = *pp; |
1933 | if (setjmp(expr_env)) { | 1933 | if (setjmp(expr_env)) { |
@@ -2190,7 +2190,7 @@ static void monitor_handle_command(const char *cmdline) | @@ -2190,7 +2190,7 @@ static void monitor_handle_command(const char *cmdline) | ||
2190 | case 'i': | 2190 | case 'i': |
2191 | case 'l': | 2191 | case 'l': |
2192 | { | 2192 | { |
2193 | - target_phys_addr_t val; | 2193 | + int64_t val; |
2194 | 2194 | ||
2195 | while (isspace(*p)) | 2195 | while (isspace(*p)) |
2196 | p++; | 2196 | p++; |