Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: warning pedantic binary const #1595

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Fix: warning pedantic binary const #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5c5de9
morse: fix binary constant pedantic warning
perigoso Jul 28, 2023
37e7ca9
target/cortexa: fix binary constant pedantic warning
perigoso Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions src/morse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,32 @@ typedef struct {
} morse_char_s;

static const morse_char_s morse_char_lut[] = {
{0b0000000000011101, 8}, // 'A' .-
{0b0000000101010111, 12}, // 'B' -...
{0b0000010111010111, 14}, // 'C' -.-.
{0b0000000001010111, 10}, // 'D' -..
{0b0000000000000001, 4}, // 'E' .
{0b0000000101110101, 12}, // 'F' ..-.
{0b0000000101110111, 12}, // 'G' --.
{0b0000000001010101, 10}, // 'H' ....
{0b0000000000000101, 6}, // 'I' ..
{0b0001110111011101, 16}, // 'J' .---
{0b0000000111010111, 12}, // 'K' -.-
{0b0000000101011101, 12}, // 'L' .-..
{0b0000000001110111, 10}, // 'M' --
{0b0000000000010111, 8}, // 'N' -.
{0b0000011101110111, 14}, // 'O' ---
{0b0000010111011101, 14}, // 'P' .--.
{0b0001110101110111, 16}, // 'Q' --.-
{0b0000000001011101, 10}, // 'R' .-.
{0b0000000000010101, 8}, // 'S' ...
{0b0000000000000111, 6}, // 'T' -
{0b0000000001110101, 10}, // 'U' ..-
{0b0000000111010101, 12}, // 'V' ...-
{0b0000000111011101, 12}, // 'W' .--
{0b0000011101010111, 14}, // 'X' -..-
{0b0001110111010111, 16}, // 'Y' -.--
{0b0000010101110111, 14}, // 'Z' --..
{0x001dU, 8U}, // 'A' .- 0b0000000000011101
{0x0157U, 12U}, // 'B' -... 0b0000000101010111
{0x05d7U, 14U}, // 'C' -.-. 0b0000010111010111
{0x0057U, 10U}, // 'D' -.. 0b0000000001010111
{0x0001U, 4U}, // 'E' . 0b0000000000000001
{0x0175U, 12U}, // 'F' ..-. 0b0000000101110101
{0x0177U, 12U}, // 'G' --. 0b0000000101110111
{0x0055U, 10U}, // 'H' .... 0b0000000001010101
{0x0005U, 6U}, // 'I' .. 0b0000000000000101
{0x1dddU, 16U}, // 'J' .--- 0b0001110111011101
{0x01d7U, 12U}, // 'K' -.- 0b0000000111010111
{0x015dU, 12U}, // 'L' .-.. 0b0000000101011101
{0x0077U, 10U}, // 'M' -- 0b0000000001110111
{0x0017U, 8U}, // 'N' -. 0b0000000000010111
{0x0777U, 14U}, // 'O' --- 0b0000011101110111
{0x05ddU, 14U}, // 'P' .--. 0b0000010111011101
{0x1d77U, 16U}, // 'Q' --.- 0b0001110101110111
{0x005dU, 10U}, // 'R' .-. 0b0000000001011101
{0x0015U, 8U}, // 'S' ... 0b0000000000010101
{0x0007U, 6U}, // 'T' - 0b0000000000000111
{0x0075U, 10U}, // 'U' ..- 0b0000000001110101
{0x01d5U, 12U}, // 'V' ...- 0b0000000111010101
{0x01ddU, 12U}, // 'W' .-- 0b0000000111011101
{0x0757U, 14U}, // 'X' -..- 0b0000011101010111
{0x1dd7U, 16U}, // 'Y' -.-- 0b0001110111010111
{0x0577U, 14U}, // 'Z' --.. 0b0000010101110111
};

volatile const char *morse_msg = NULL;
Expand Down
16 changes: 8 additions & 8 deletions src/target/cortexa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,17 @@ typedef struct cortexa_priv {
#define DBGBCR_BAS_LOW_HW (0x3U << 5U)
#define DBGBCR_BAS_HIGH_HW (0xcU << 5U)
#define DBGBCR_EN (1U << 0U)
#define DBGBCR_PMC_ANY (0b11U << 1U)
#define DBGBCR_PMC_ANY (0x3U << 1U) /* 0b11 */

#define DBGWVR(i) (96U + (i))
#define DBGWCR(i) (112U + (i))
#define DBGWCR_LSC_LOAD (0b01U << 3U)
#define DBGWCR_LSC_STORE (0b10U << 3U)
#define DBGWCR_LSC_ANY (0b11U << 3U)
#define DBGWCR_BAS_BYTE (0b0001U << 5U)
#define DBGWCR_BAS_HALFWORD (0b0011U << 5U)
#define DBGWCR_BAS_WORD (0b1111U << 5U)
#define DBGWCR_PAC_ANY (0b11U << 1U)
#define DBGWCR_LSC_LOAD (0x1U << 3U) /* 0b01 */
#define DBGWCR_LSC_STORE (0x2U << 3U) /* 0b10 */
#define DBGWCR_LSC_ANY (0x3U << 3U) /* 0b11U */
#define DBGWCR_BAS_BYTE (0x1U << 5U) /* 0b0001U */
#define DBGWCR_BAS_HALFWORD (0x3U << 5U) /* 0b0011U */
#define DBGWCR_BAS_WORD (0xfU << 5U) /* 0b1111U */
#define DBGWCR_PAC_ANY (0x3U << 1U) /* 0b11U */
#define DBGWCR_EN (1U << 0U)

/* Instruction encodings for accessing the coprocessor interface */
Expand Down