|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] unlzma: replace INIT
commit 0d8e20de1a9963d1f0c3954400d8f582dd05ee43
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Apr 16 14:38:50 2021 +0200
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Apr 16 14:38:50 2021 +0200
unlzma: replace INIT
There's no need for this abstraction.
Requested-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
---
xen/common/unlzma.c | 68 ++++++++++++++++++++++++++---------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/xen/common/unlzma.c b/xen/common/unlzma.c
index ea5ab41738..d0ef78eef0 100644
--- a/xen/common/unlzma.c
+++ b/xen/common/unlzma.c
@@ -30,7 +30,7 @@
#include "decompress.h"
-static long long INIT read_int(unsigned char *ptr, int size)
+static long long __init read_int(unsigned char *ptr, int size)
{
int i;
long long ret = 0;
@@ -76,13 +76,13 @@ struct rc {
#define RC_MODEL_TOTAL_BITS 11
-static int INIT nofill(void *buffer, unsigned int len)
+static int __init nofill(void *buffer, unsigned int len)
{
return -1;
}
/* Called twice: once at startup and once in rc_normalize() */
-static void INIT rc_read(struct rc *rc)
+static void __init rc_read(struct rc *rc)
{
rc->buffer_size = rc->fill((char *)rc->buffer, LZMA_IOBUF_SIZE);
if (rc->buffer_size <= 0)
@@ -92,9 +92,9 @@ static void INIT rc_read(struct rc *rc)
}
/* Called once */
-static inline void INIT rc_init(struct rc *rc,
- int (*fill)(void*, unsigned int),
- unsigned char *buffer, int buffer_size)
+static inline void __init rc_init(struct rc *rc,
+ int (*fill)(void*, unsigned int),
+ unsigned char *buffer, int buffer_size)
{
if (fill)
rc->fill = fill;
@@ -109,7 +109,7 @@ static inline void INIT rc_init(struct rc *rc,
rc->range = 0xFFFFFFFF;
}
-static inline void INIT rc_init_code(struct rc *rc)
+static inline void __init rc_init_code(struct rc *rc)
{
int i;
@@ -122,14 +122,14 @@ static inline void INIT rc_init_code(struct rc *rc)
/* Called twice, but one callsite is in inline'd rc_is_bit_0_helper() */
-static void INIT rc_do_normalize(struct rc *rc)
+static void __init rc_do_normalize(struct rc *rc)
{
if (rc->ptr >= rc->buffer_end)
rc_read(rc);
rc->range <<= 8;
rc->code = (rc->code << 8) | *rc->ptr++;
}
-static inline void INIT rc_normalize(struct rc *rc)
+static inline void __init rc_normalize(struct rc *rc)
{
if (rc->range < (1 << RC_TOP_BITS))
rc_do_normalize(rc);
@@ -139,20 +139,20 @@ static inline void INIT rc_normalize(struct rc *rc)
/* Why rc_is_bit_0_helper exists?
*Because we want to always expose (rc->code < rc->bound) to optimizer
*/
-static inline uint32_t INIT rc_is_bit_0_helper(struct rc *rc, uint16_t *p)
+static inline uint32_t __init rc_is_bit_0_helper(struct rc *rc, uint16_t *p)
{
rc_normalize(rc);
rc->bound = *p * (rc->range >> RC_MODEL_TOTAL_BITS);
return rc->bound;
}
-static inline int INIT rc_is_bit_0(struct rc *rc, uint16_t *p)
+static inline int __init rc_is_bit_0(struct rc *rc, uint16_t *p)
{
uint32_t t = rc_is_bit_0_helper(rc, p);
return rc->code < t;
}
/* Called ~10 times, but very small, thus inlined */
-static inline void INIT rc_update_bit_0(struct rc *rc, uint16_t *p)
+static inline void __init rc_update_bit_0(struct rc *rc, uint16_t *p)
{
rc->range = rc->bound;
*p += ((1 << RC_MODEL_TOTAL_BITS) - *p) >> RC_MOVE_BITS;
@@ -165,7 +165,7 @@ static inline void rc_update_bit_1(struct rc *rc, uint16_t
*p)
}
/* Called 4 times in unlzma loop */
-static int INIT rc_get_bit(struct rc *rc, uint16_t *p, int *symbol)
+static int __init rc_get_bit(struct rc *rc, uint16_t *p, int *symbol)
{
if (rc_is_bit_0(rc, p)) {
rc_update_bit_0(rc, p);
@@ -179,7 +179,7 @@ static int INIT rc_get_bit(struct rc *rc, uint16_t *p, int
*symbol)
}
/* Called once */
-static inline int INIT rc_direct_bit(struct rc *rc)
+static inline int __init rc_direct_bit(struct rc *rc)
{
rc_normalize(rc);
rc->range >>= 1;
@@ -191,7 +191,7 @@ static inline int INIT rc_direct_bit(struct rc *rc)
}
/* Called twice */
-static inline void INIT
+static inline void __init
rc_bit_tree_decode(struct rc *rc, uint16_t *p, int num_levels, int *symbol)
{
int i = num_levels;
@@ -283,14 +283,14 @@ struct cstate {
uint32_t rep0, rep1, rep2, rep3;
};
-static inline size_t INIT get_pos(struct writer *wr)
+static inline size_t __init get_pos(struct writer *wr)
{
return
wr->global_pos + wr->buffer_pos;
}
-static inline uint8_t INIT peek_old_byte(struct writer *wr,
- uint32_t offs)
+static inline uint8_t __init peek_old_byte(struct writer *wr,
+ uint32_t offs)
{
if (!wr->flush) {
int32_t pos;
@@ -307,7 +307,7 @@ static inline uint8_t INIT peek_old_byte(struct writer *wr,
}
-static inline int INIT write_byte(struct writer *wr, uint8_t byte)
+static inline int __init write_byte(struct writer *wr, uint8_t byte)
{
wr->buffer[wr->buffer_pos++] = wr->previous_byte = byte;
if (wr->flush && wr->buffer_pos == wr->header->dict_size) {
@@ -321,13 +321,13 @@ static inline int INIT write_byte(struct writer *wr,
uint8_t byte)
}
-static inline int INIT copy_byte(struct writer *wr, uint32_t offs)
+static inline int __init copy_byte(struct writer *wr, uint32_t offs)
{
return write_byte(wr, peek_old_byte(wr, offs));
}
-static inline int INIT copy_bytes(struct writer *wr,
- uint32_t rep0, int len)
+static inline int __init copy_bytes(struct writer *wr,
+ uint32_t rep0, int len)
{
do {
if (copy_byte(wr, rep0))
@@ -338,10 +338,10 @@ static inline int INIT copy_bytes(struct writer *wr,
return len;
}
-static inline int INIT process_bit0(struct writer *wr, struct rc *rc,
- struct cstate *cst, uint16_t *p,
- int pos_state, uint16_t *prob,
- int lc, uint32_t literal_pos_mask) {
+static inline int __init process_bit0(struct writer *wr, struct rc *rc,
+ struct cstate *cst, uint16_t *p,
+ int pos_state, uint16_t *prob,
+ int lc, uint32_t literal_pos_mask) {
int mi = 1;
rc_update_bit_0(rc, prob);
prob = (p + LZMA_LITERAL +
@@ -382,9 +382,9 @@ static inline int INIT process_bit0(struct writer *wr,
struct rc *rc,
return write_byte(wr, mi);
}
-static inline int INIT process_bit1(struct writer *wr, struct rc *rc,
- struct cstate *cst, uint16_t *p,
- int pos_state, uint16_t *prob) {
+static inline int __init process_bit1(struct writer *wr, struct rc *rc,
+ struct cstate *cst, uint16_t *p,
+ int pos_state, uint16_t *prob) {
int offset;
uint16_t *prob_len;
int num_bits;
@@ -528,11 +528,11 @@ static inline int INIT process_bit1(struct writer *wr,
struct rc *rc,
-int INIT unlzma(unsigned char *buf, unsigned int in_len,
- int(*fill)(void*, unsigned int),
- int(*flush)(void*, unsigned int),
- unsigned char *output, unsigned int *posp,
- void(*error)(const char *x))
+int __init unlzma(unsigned char *buf, unsigned int in_len,
+ int(*fill)(void*, unsigned int),
+ int(*flush)(void*, unsigned int),
+ unsigned char *output, unsigned int *posp,
+ void(*error)(const char *x))
{
struct lzma_header header;
int lc, pb, lp;
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |