Skip to content

Fix undefined behavior #19

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

Merged
merged 5 commits into from
Jul 3, 2023
Merged

Fix undefined behavior #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f00150
Fix undefined behavior
alrvid Jun 30, 2023
578cd84
Extend block device data types
alrvid Jun 30, 2023
a272ff6
Update declaration to match definition exactly
alrvid Jun 30, 2023
8d40a8a
Update declaration to match definition exactly
alrvid Jun 30, 2023
eda8173
Fix multiplication overflow
alrvid Jun 30, 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
6 changes: 3 additions & 3 deletions libraries/BlockDevices/BlockDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#define BD_ERROR_DEVICE_ERROR (-4001)
#define BD_ERROR_WRITE_PROTECTED (4002)

typedef uint32_t bd_addr_t;
typedef uint32_t bd_size_t;
typedef uint64_t bd_addr_t;
typedef uint64_t bd_size_t;
typedef pin_size_t pin_t;

/* -------------------------------------------------------------------------- */
Expand Down Expand Up @@ -107,4 +107,4 @@ class BlockDevice {
virtual const char *get_type() const = 0;
};

#endif
#endif
4 changes: 2 additions & 2 deletions libraries/BlockDevices/CodeFlashBlockDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ using FLASH_set_callback_f = fsp_err_t (*)(flash_ctrl_t * const p_api_ct
class CodeFlashBlockDevice : public BlockDevice {
private:
CodeFlashBlockDevice();
int erase_block(uint32_t add);
int check_blank(uint32_t add);
int erase_block(bd_addr_t add);
int check_blank(bd_addr_t add);
uint32_t get_block_starting_address(bd_addr_t add);
uint32_t get_physical_address(bd_addr_t add);
virtual int write(const void *buffer, bd_addr_t addr, bd_size_t size) override;
Expand Down
6 changes: 3 additions & 3 deletions libraries/BlockDevices/DataFlashBlockDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ using FLASH_set_callback_f = fsp_err_t (*)(flash_ctrl_t * const p_api_ct
class DataFlashBlockDevice : public BlockDevice {
private:
DataFlashBlockDevice();
int erase_block(uint32_t add);
int check_blank(uint32_t add);
int erase_block(bd_addr_t add);
int check_blank(bd_addr_t add);
uint32_t get_block_starting_address(bd_addr_t add);
uint32_t get_physical_address(bd_addr_t add);
bool is_address_correct(bd_addr_t add);
Expand Down Expand Up @@ -136,4 +136,4 @@ class DataFlashBlockDevice : public BlockDevice {
};


#endif
#endif
4 changes: 2 additions & 2 deletions libraries/BlockDevices/SDCardBlockDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ int SDCardBlockDevice::open() {
read_block_size = sd_card_info.sector_size_bytes;
erase_block_size = sd_card_info.sector_size_bytes;
write_block_size = sd_card_info.sector_size_bytes;
total_size = sd_card_info.sector_count * sd_card_info.sector_size_bytes;
total_size = (bd_size_t) sd_card_info.sector_count * (bd_size_t) sd_card_info.sector_size_bytes;

}
}
Expand Down Expand Up @@ -478,7 +478,7 @@ fsp_err_t SDCardBlockDevice::wait_for_completition() {

rv = FSP_ERR_TIMEOUT;
}

return rv;
}


Expand Down