interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TARGET: removed unsed parameter 

Parameter "type" of function armv4_5_mmu_translate_va()
is now not used.
Remove the parameter and the "enum" listing its values.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Antonio Borneo 2010-06-12 11:58:50 +08:00 committed by Øyvind Harboe
parent ce58ab9a4e
commit 9e62f86f24
7 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/target/arm720t.c
View File

@ -254,14 +254,14 @@ static int arm720_mmu(struct target *target, int *enabled)
static int arm720_virt2phys(struct target *target, static int arm720_virt2phys(struct target *target,
uint32_t virtual, uint32_t *physical) uint32_t virtual, uint32_t *physical)
{ {
int type;
uint32_t cb; uint32_t cb;
int domain; int domain;
uint32_t ap; uint32_t ap;
struct arm720t_common *arm720t = target_to_arm720(target); struct arm720t_common *arm720t = target_to_arm720(target);
uint32_t ret; uint32_t ret;
int retval = armv4_5_mmu_translate_va(target, &arm720t->armv4_5_mmu, virtual, &type, &cb, &domain, &ap, &ret); int retval = armv4_5_mmu_translate_va(target,
&arm720t->armv4_5_mmu, virtual, &cb, &domain, &ap, &ret);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
*physical = ret; *physical = ret;

6
src/target/arm920t.c
View File

@ -508,7 +508,6 @@ static int arm920_mmu(struct target *target, int *enabled)
static int arm920_virt2phys(struct target *target, static int arm920_virt2phys(struct target *target,
uint32_t virt, uint32_t *phys) uint32_t virt, uint32_t *phys)
{ {
int type;
uint32_t cb; uint32_t cb;
int domain; int domain;
uint32_t ap; uint32_t ap;
@ -516,7 +515,7 @@ static int arm920_virt2phys(struct target *target,
uint32_t ret; uint32_t ret;
int retval = armv4_5_mmu_translate_va(target, int retval = armv4_5_mmu_translate_va(target,
&arm920t->armv4_5_mmu, virt, &type, &cb, &domain, &ap, &ret); &arm920t->armv4_5_mmu, virt, &cb, &domain, &ap, &ret);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
*phys = ret; *phys = ret;
@ -579,7 +578,6 @@ int arm920t_write_memory(struct target *target, uint32_t address,
* in memory marked read only * in memory marked read only
* by MMU * by MMU
*/ */
int type;
uint32_t cb; uint32_t cb;
int domain; int domain;
uint32_t ap; uint32_t ap;
@ -589,7 +587,7 @@ int arm920t_write_memory(struct target *target, uint32_t address,
* We need physical address and cb * We need physical address and cb
*/ */
retval = armv4_5_mmu_translate_va(target, &arm920t->armv4_5_mmu, retval = armv4_5_mmu_translate_va(target, &arm920t->armv4_5_mmu,
address, &type, &cb, &domain, &ap, &pa); address, &cb, &domain, &ap, &pa);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;

4
src/target/arm926ejs.c
View File

@ -720,14 +720,14 @@ COMMAND_HANDLER(arm926ejs_handle_cache_info_command)
static int arm926ejs_virt2phys(struct target *target, uint32_t virtual, uint32_t *physical) static int arm926ejs_virt2phys(struct target *target, uint32_t virtual, uint32_t *physical)
{ {
int type;
uint32_t cb; uint32_t cb;
int domain; int domain;
uint32_t ap; uint32_t ap;
struct arm926ejs_common *arm926ejs = target_to_arm926(target); struct arm926ejs_common *arm926ejs = target_to_arm926(target);
uint32_t ret; uint32_t ret;
int retval = armv4_5_mmu_translate_va(target, &arm926ejs->armv4_5_mmu, virtual, &type, &cb, &domain, &ap, &ret); int retval = armv4_5_mmu_translate_va(target, &arm926ejs->armv4_5_mmu,
virtual, &cb, &domain, &ap, &ret);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
*physical = ret; *physical = ret;

6
src/target/armv4_5_mmu.c
View File

@ -26,7 +26,7 @@
#include "armv4_5_mmu.h" #include "armv4_5_mmu.h"
int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap, uint32_t *val) int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, uint32_t *cb, int *domain, uint32_t *ap, uint32_t *val)
{ {
uint32_t first_lvl_descriptor = 0x0; uint32_t first_lvl_descriptor = 0x0;
uint32_t second_lvl_descriptor = 0x0; uint32_t second_lvl_descriptor = 0x0;
@ -60,7 +60,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
if ((first_lvl_descriptor & 0x3) == 2) if ((first_lvl_descriptor & 0x3) == 2)
{ {
/* section descriptor */ /* section descriptor */
*type = ARMV4_5_SECTION;
*cb = (first_lvl_descriptor & 0xc) >> 2; *cb = (first_lvl_descriptor & 0xc) >> 2;
*ap = (first_lvl_descriptor & 0xc00) >> 10; *ap = (first_lvl_descriptor & 0xc00) >> 10;
*val = (first_lvl_descriptor & 0xfff00000) | (va & 0x000fffff); *val = (first_lvl_descriptor & 0xfff00000) | (va & 0x000fffff);
@ -102,7 +101,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
if ((second_lvl_descriptor & 0x3) == 1) if ((second_lvl_descriptor & 0x3) == 1)
{ {
/* large page descriptor */ /* large page descriptor */
*type = ARMV4_5_LARGE_PAGE;
*ap = (second_lvl_descriptor & 0xff0) >> 4; *ap = (second_lvl_descriptor & 0xff0) >> 4;
*val = (second_lvl_descriptor & 0xffff0000) | (va & 0x0000ffff); *val = (second_lvl_descriptor & 0xffff0000) | (va & 0x0000ffff);
return ERROR_OK; return ERROR_OK;
@ -111,7 +109,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
if ((second_lvl_descriptor & 0x3) == 2) if ((second_lvl_descriptor & 0x3) == 2)
{ {
/* small page descriptor */ /* small page descriptor */
*type = ARMV4_5_SMALL_PAGE;
*ap = (second_lvl_descriptor & 0xff0) >> 4; *ap = (second_lvl_descriptor & 0xff0) >> 4;
*val = (second_lvl_descriptor & 0xfffff000) | (va & 0x00000fff); *val = (second_lvl_descriptor & 0xfffff000) | (va & 0x00000fff);
return ERROR_OK; return ERROR_OK;
@ -120,7 +117,6 @@ int armv4_5_mmu_translate_va(struct target *target, struct armv4_5_mmu_common *a
if ((second_lvl_descriptor & 0x3) == 3) if ((second_lvl_descriptor & 0x3) == 3)
{ {
/* tiny page descriptor */ /* tiny page descriptor */
*type = ARMV4_5_TINY_PAGE;
*ap = (second_lvl_descriptor & 0x30) >> 4; *ap = (second_lvl_descriptor & 0x30) >> 4;
*val = (second_lvl_descriptor & 0xfffffc00) | (va & 0x000003ff); *val = (second_lvl_descriptor & 0xfffffc00) | (va & 0x000003ff);
return ERROR_OK; return ERROR_OK;

9
src/target/armv4_5_mmu.h
View File

@ -36,15 +36,8 @@ struct armv4_5_mmu_common
int mmu_enabled; int mmu_enabled;
}; };
enum
{
ARMV4_5_SECTION, ARMV4_5_LARGE_PAGE, ARMV4_5_SMALL_PAGE, ARMV4_5_TINY_PAGE
};
extern char* armv4_5_page_type_names[];
int armv4_5_mmu_translate_va(struct target *target, int armv4_5_mmu_translate_va(struct target *target,
struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type, struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va,
uint32_t *cb, int *domain, uint32_t *ap, uint32_t *val); uint32_t *cb, int *domain, uint32_t *ap, uint32_t *val);
int armv4_5_mmu_read_physical(struct target *target, int armv4_5_mmu_read_physical(struct target *target,

3
src/target/cortex_a8.c
View File

@ -1801,7 +1801,6 @@ static int cortex_a8_mmu(struct target *target, int *enabled)
static int cortex_a8_virt2phys(struct target *target, static int cortex_a8_virt2phys(struct target *target,
uint32_t virt, uint32_t *phys) uint32_t virt, uint32_t *phys)
{ {
int type;
uint32_t cb; uint32_t cb;
int domain; int domain;
uint32_t ap; uint32_t ap;
@ -1819,7 +1818,7 @@ static int cortex_a8_virt2phys(struct target *target,
cortex_a8->current_address_mode = ARM_MODE_SVC; cortex_a8->current_address_mode = ARM_MODE_SVC;
uint32_t ret; uint32_t ret;
int retval = armv4_5_mmu_translate_va(target, int retval = armv4_5_mmu_translate_va(target,
&armv7a->armv4_5_mmu, virt, &type, &cb, &domain, &ap, &ret); &armv7a->armv4_5_mmu, virt, &cb, &domain, &ap, &ret);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* Reset the flag. We don't want someone else to use it by error */ /* Reset the flag. We don't want someone else to use it by error */

4
src/target/xscale.c
View File

@ -3216,7 +3216,6 @@ static int xscale_virt2phys(struct target *target,
uint32_t virtual, uint32_t *physical) uint32_t virtual, uint32_t *physical)
{ {
struct xscale_common *xscale = target_to_xscale(target); struct xscale_common *xscale = target_to_xscale(target);
int type;
uint32_t cb; uint32_t cb;
int domain; int domain;
uint32_t ap; uint32_t ap;
@ -3227,7 +3226,8 @@ static int xscale_virt2phys(struct target *target,
} }
uint32_t ret; uint32_t ret;
int retval = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu, virtual, &type, &cb, &domain, &ap, &ret); int retval = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu,
virtual, &cb, &domain, &ap, &ret);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
*physical = ret; *physical = ret;