diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2016-09-09 13:08:51 +0100 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2016-09-21 00:31:07 +0100 |
| commit | 84ff8a4df9eac157ea9df22054b996fef5b34d8f (patch) | |
| tree | 59f61678a6f25b655269297212dbddedd76debbf /utils/regtools/headergen_v1.cpp | |
| parent | 5918e18e816e23fa9c097d0e8cf0a5813538018b (diff) | |
| download | rockbox-84ff8a4df9eac157ea9df22054b996fef5b34d8f.tar.gz rockbox-84ff8a4df9eac157ea9df22054b996fef5b34d8f.zip | |
headergen_v1: remove warnings with newer GCCs
Change-Id: I90ed3a0c911014eee013cbea0e98a85f4310471d
Diffstat (limited to 'utils/regtools/headergen_v1.cpp')
| -rw-r--r-- | utils/regtools/headergen_v1.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/utils/regtools/headergen_v1.cpp b/utils/regtools/headergen_v1.cpp index 7b38366d5d..155ff2389f 100644 --- a/utils/regtools/headergen_v1.cpp +++ b/utils/regtools/headergen_v1.cpp | |||
| @@ -567,28 +567,28 @@ void gen_macro(const std::string& filename, bool variadic, char const *author, c | |||
| 567 | const int MAX_NARGS = 32; | 567 | const int MAX_NARGS = 32; |
| 568 | 568 | ||
| 569 | fprintf(f, "\ | 569 | fprintf(f, "\ |
| 570 | #define BF_SET(reg, field) "REG_WRITE"(%1$s##reg##_SET, BM_##reg##_##field)\n\ | 570 | #define BF_SET(reg, field) " REG_WRITE "(%1$s##reg##_SET, BM_##reg##_##field)\n\ |
| 571 | #define BF_CLR(reg, field) "REG_WRITE"(%1$s##reg##_CLR, BM_##reg##_##field)\n\ | 571 | #define BF_CLR(reg, field) " REG_WRITE "(%1$s##reg##_CLR, BM_##reg##_##field)\n\ |
| 572 | #define BF_TOG(reg, field) "REG_WRITE"(%1$s##reg##_TOG, BM_##reg##_##field)\n\ | 572 | #define BF_TOG(reg, field) " REG_WRITE "(%1$s##reg##_TOG, BM_##reg##_##field)\n\ |
| 573 | \n\ | 573 | \n\ |
| 574 | #define BF_SETV(reg, field, v) "REG_WRITE"(%1$s##reg##_SET, BF_##reg##_##field(v))\n\ | 574 | #define BF_SETV(reg, field, v) " REG_WRITE "(%1$s##reg##_SET, BF_##reg##_##field(v))\n\ |
| 575 | #define BF_CLRV(reg, field, v) "REG_WRITE"(%1$s##reg##_CLR, BF_##reg##_##field(v))\n\ | 575 | #define BF_CLRV(reg, field, v) " REG_WRITE "(%1$s##reg##_CLR, BF_##reg##_##field(v))\n\ |
| 576 | #define BF_TOGV(reg, field, v) "REG_WRITE"(%1$s##reg##_TOG, BF_##reg##_##field(v))\n\ | 576 | #define BF_TOGV(reg, field, v) " REG_WRITE "(%1$s##reg##_TOG, BF_##reg##_##field(v))\n\ |
| 577 | \n\ | 577 | \n\ |
| 578 | #define BF_RDX(val, reg, field) (("REG_READ"(val) & BM_##reg##_##field) >> BP_##reg##_##field)\n\ | 578 | #define BF_RDX(val, reg, field) ((" REG_READ "(val) & BM_##reg##_##field) >> BP_##reg##_##field)\n\ |
| 579 | #define BF_RD(reg, field) BF_RDX("REG_READ"(%1$s##reg), reg, field)\n\ | 579 | #define BF_RD(reg, field) BF_RDX(" REG_READ "(%1$s##reg), reg, field)\n\ |
| 580 | #define BF_WRX(val, reg, field, v) "REG_WRITE"(val, ("REG_READ"(val) & ~BM_##reg##_##field) | (((v) << BP_##reg##_##field) & BM_##reg##_##field))\n\ | 580 | #define BF_WRX(val, reg, field, v) " REG_WRITE "(val, (" REG_READ "(val) & ~BM_##reg##_##field) | (((v) << BP_##reg##_##field) & BM_##reg##_##field))\n\ |
| 581 | #define BF_WR(reg, field, v) BF_WRX(%1$s##reg, reg, field, v)\n\ | 581 | #define BF_WR(reg, field, v) BF_WRX(%1$s##reg, reg, field, v)\n\ |
| 582 | #define BF_WR_V(reg, field, sy) BF_WR(reg, field, BV_##reg##_##field##__##sy)\n\ | 582 | #define BF_WR_V(reg, field, sy) BF_WR(reg, field, BV_##reg##_##field##__##sy)\n\ |
| 583 | #define BF_WR_VX(val, reg, field, sy) BF_WRX(val, reg, field, BV_##reg##_##field##__##sy)\n\ | 583 | #define BF_WR_VX(val, reg, field, sy) BF_WRX(val, reg, field, BV_##reg##_##field##__##sy)\n\ |
| 584 | \n\ | 584 | \n\ |
| 585 | #define BF_SETn(reg, n, field) "REG_WRITE"(%1$s##reg##_SET(n), BM_##reg##_##field)\n\ | 585 | #define BF_SETn(reg, n, field) " REG_WRITE "(%1$s##reg##_SET(n), BM_##reg##_##field)\n\ |
| 586 | #define BF_CLRn(reg, n, field) "REG_WRITE"(%1$s##reg##_CLR(n), BM_##reg##_##field)\n\ | 586 | #define BF_CLRn(reg, n, field) " REG_WRITE "(%1$s##reg##_CLR(n), BM_##reg##_##field)\n\ |
| 587 | #define BF_TOGn(reg, n, field) "REG_WRITE"(%1$s##reg##_TOG(n), BM_##reg##_##field)\n\ | 587 | #define BF_TOGn(reg, n, field) " REG_WRITE "(%1$s##reg##_TOG(n), BM_##reg##_##field)\n\ |
| 588 | \n\ | 588 | \n\ |
| 589 | #define BF_SETVn(reg, n, field, v) "REG_WRITE"(%1$s##reg##_SET(n), BF_##reg##_##field(v))\n\ | 589 | #define BF_SETVn(reg, n, field, v) " REG_WRITE "(%1$s##reg##_SET(n), BF_##reg##_##field(v))\n\ |
| 590 | #define BF_CLRVn(reg, n, field, v) "REG_WRITE"(%1$s##reg##_CLR(n), BF_##reg##_##field(v))\n\ | 590 | #define BF_CLRVn(reg, n, field, v) " REG_WRITE "(%1$s##reg##_CLR(n), BF_##reg##_##field(v))\n\ |
| 591 | #define BF_TOGVn(reg, n, field, v) "REG_WRITE"(%1$s##reg##_TOG(n), BF_##reg##_##field(v))\n\ | 591 | #define BF_TOGVn(reg, n, field, v) " REG_WRITE "(%1$s##reg##_TOG(n), BF_##reg##_##field(v))\n\ |
| 592 | \n\ | 592 | \n\ |
| 593 | #define BF_RDn(reg, n, field) BF_RDX(%1$s##reg(n), reg, field)\n\ | 593 | #define BF_RDn(reg, n, field) BF_RDX(%1$s##reg(n), reg, field)\n\ |
| 594 | #define BF_WRn(reg, n, field, v) BF_WRX(%1$s##reg(n), reg, field, v)\n\ | 594 | #define BF_WRn(reg, n, field, v) BF_WRX(%1$s##reg(n), reg, field, v)\n\ |