github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-08 12:19:06 +00:00
Code Issues Projects Releases Wiki Activity

HV:treewide:Update return type for bit operations fls and clz

Browse Source 
Change the return type of function fls and clz as uint16_t;
When the input is zero, INVALID_BIT_INDEX is returned;
Update temporary variable type and return value check of caller
when it call fls or clz;
When input value is zero, clz returns 32 directly.

V1-->V2:
        INVALID_BIT_INDEX instead of INVALID_NUMBER;
        Add type conversion as needed;
        Add "U/UL" for constant value as needed;
        Codeing style fixing.
V2-->V3:
       Use type conversion to remove side effect of
       the variable which stores fls/clz return value;
       fls return INVALID_BIT_INDEX directly when the
       input value is zero.
V3-->v4:
       Clean up comments for fls.

Note: For instruction "bsrl", destination register value
      is undefined when source register value is zero.

Signed-off-by: Xiangyang Wu <xiangyang.wu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Xiangyang Wu
2018-07-02 13:48:11 +08:00
committed by lijinxia
parent 4110f3a87f
commit 13d354e7a6
3 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hypervisor/arch/x86/guest/vlapic.c
View File

@@ -767,25 +767,26 @@ vlapic_process_eoi(struct vlapic *vlapic)
{
struct lapic_regs *lapic = vlapic->apic_page;
struct lapic_reg *isrptr, *tmrptr;
int i, bitpos, vector;
int i, vector;
uint16_t bitpos;
isrptr = &lapic->isr[0];
tmrptr = &lapic->tmr[0];
for (i = 7; i >= 0; i--) {
bitpos = fls(isrptr[i].val);
if (bitpos >= 0) {
if (bitpos != INVALID_BIT_INDEX) {
if (vlapic->isrvec_stk_top <= 0) {
panic("invalid vlapic isrvec_stk_top %d",
vlapic->isrvec_stk_top);
}
isrptr[i].val &= ~(1 << bitpos);
vector = i * 32 + bitpos;
isrptr[i].val &= ~(1U << (uint32_t)bitpos);
vector = i * 32 + (int32_t)bitpos;
dev_dbg(ACRN_DBG_LAPIC, "EOI vector %d", vector);
VLAPIC_CTR_ISR(vlapic, "vlapic_process_eoi");
vlapic->isrvec_stk_top--;
vlapic_update_ppr(vlapic);
if ((tmrptr[i].val & (1 << bitpos)) != 0) {
if ((tmrptr[i].val & (1U << (uint32_t)bitpos)) != 0U) {
/* hook to vIOAPIC */
vioapic_process_eoi(vlapic->vm, vector);
}
@@ -1131,7 +1132,8 @@ int
vlapic_pending_intr(struct vlapic *vlapic, uint32_t *vecptr)
{
struct lapic_regs *lapic = vlapic->apic_page;
int i, bitpos;
int i;
uint16_t bitpos;
uint32_t vector;
uint32_t val;
struct lapic_reg *irrptr;
@@ -1144,8 +1146,8 @@ vlapic_pending_intr(struct vlapic *vlapic, uint32_t *vecptr)
for (i = 7; i >= 0; i--) {
val = atomic_load((int *)&irrptr[i].val);
bitpos = fls(val);
if (bitpos >= 0) {
vector = i * 32 + bitpos;
if (bitpos != INVALID_BIT_INDEX) {
vector = (uint32_t)(i * 32) + (uint32_t)bitpos;
if (PRIO(vector) > PRIO(lapic->ppr)) {
if (vecptr != NULL)
*vecptr = vector;