OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add preprocessor directive __attribute__((packed)) to cromfs_node_s 

This directive tells the compiler that cromfs_node_s might be located at a memory
address which is not word aligned. This resolves the hardFault caused by unaligned
memory access on armv6-m architecture which doesn't support it.
This commit is contained in:
vxj9800 2022-05-31 07:40:55 -05:00 committed by Xiang Xiao
parent 39f174908f
commit bfde3c007d
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fs/cromfs/cromfs.h
View File

@ -71,12 +71,12 @@
struct cromfs_volume_s struct cromfs_volume_s
{ {
uint32_t cv_magic; /* Must be first. Must be CROMFS_MAGIC */ uint32_t cv_magic; /* Must be first. Must be CROMFS_MAGIC */
uint16_t cv_nnodes; /* Total number of nodes in-use */ uint16_t cv_nnodes; /* Total number of nodes in-use */
uint16_t cv_nblocks; /* Total number of data blocks in-use */ uint16_t cv_nblocks; /* Total number of data blocks in-use */
uint32_t cv_root; /* Offset to the first node in the root file system */ uint32_t cv_root; /* Offset to the first node in the root file system */
uint32_t cv_fsize; /* Size of the compressed file system image */ uint32_t cv_fsize; /* Size of the compressed file system image */
uint32_t cv_bsize; /* Optimal block size for transfers */ uint32_t cv_bsize; /* Optimal block size for transfers */
}; };
/* This describes one node in the CROMFS file system. It holds node meta data /* This describes one node in the CROMFS file system. It holds node meta data
@ -102,20 +102,20 @@ struct cromfs_volume_s
* Return 0 * Return 0
*/ */
struct cromfs_node_s begin_packed_struct struct cromfs_node_s
{ {
uint16_t cn_mode; /* File type, attributes, and access mode bits */ uint16_t cn_mode; /* File type, attributes, and access mode bits */
uint16_t cn_pad; /* Not used */ uint16_t cn_pad; /* Not used */
uint32_t cn_name; /* Offset from the beginning of the volume header to the uint32_t cn_name; /* Offset from the beginning of the volume header to the
* node name string. NUL-terminated. */ * node name string. NUL-terminated. */
uint32_t cn_size; /* Size of the uncompressed data (in bytes) */ uint32_t cn_size; /* Size of the uncompressed data (in bytes) */
uint32_t cn_peer; /* Offset to next node in this directory (for readdir()) */ uint32_t cn_peer; /* Offset to next node in this directory (for readdir()) */
union union
{ {
uint32_t cn_child; /* Offset to first node in sub-directory (directories only) */ uint32_t cn_child; /* Offset to first node in sub-directory (directories only) */
uint32_t cn_link; /* Offset to an arbitrary node (for hard link) */ uint32_t cn_link; /* Offset to an arbitrary node (for hard link) */
uint32_t cn_blocks; /* Offset to first block of compressed data (for read) */ uint32_t cn_blocks; /* Offset to first block of compressed data (for read) */
} u; } u;
}; } end_packed_struct; /* Use packed access since cromfs nodes may be unaligned */
#endif /* __FS_CROMFS_CROMFS_H */ #endif /* __FS_CROMFS_CROMFS_H */