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 compilation error in my_x11_xevent.c (#1938) and dynarec_rv64_helper.c #1952

Merged
merged 1 commit into from
Oct 22, 2024
Merged

Fix compilation error in my_x11_xevent.c (#1938) and dynarec_rv64_helper.c #1952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/dynarec/rv64/dynarec_rv64_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2694,11 +2694,12 @@ void vector_loadmask(dynarec_rv64_t* dyn, int ninst, int vreg, uint64_t imm, int
ADDI(s1, xZR, 1);
VMV_S_X(vreg, s1);
return;
case 2:
case 2: {
int scratch = fpu_get_scratch(dyn);
VMV_V_I(scratch, 1);
VSLIDE1UP_VX(vreg, scratch, xZR, VECTOR_UNMASKED);
return;
}
case 3:
VMV_V_I(vreg, 1);
return;
Expand Down
6 changes: 4 additions & 2 deletions src/libtools/my_x11_xevent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ void convertXEvent(my_XEvent_32_t* dst, my_XEvent_t* src)
dst->xcookie.cookie = src->xcookie.cookie;
dst->xcookie.data = to_ptrv_silent(src->xcookie.data); // in case data are not initialized
break;
default:
default: {
register_events_t* head = register_events_head;
while(head) {
if(type>=head->start_event && type<=head->end_event) {
Expand All @@ -269,6 +269,7 @@ void convertXEvent(my_XEvent_32_t* dst, my_XEvent_t* src)
head = head->next;
}
printf_log(LOG_INFO, "Warning, unsupported 32bits XEvent type=%d\n", type);
}
}
}
void unconvertXEvent(my_XEvent_t* dst, my_XEvent_32_t* src)
Expand Down Expand Up @@ -492,7 +493,7 @@ void unconvertXEvent(my_XEvent_t* dst, my_XEvent_32_t* src)
dst->xcookie.data = from_ptrv(src->xcookie.data);
break;

default:
default: {
register_events_t* head = register_events_head;
while(head) {
if(type>=head->start_event && type<=head->end_event) {
Expand All @@ -505,6 +506,7 @@ void unconvertXEvent(my_XEvent_t* dst, my_XEvent_32_t* src)
head = head->next;
}
printf_log(LOG_INFO, "Warning, unsupported 32bits (un)XEvent type=%d\n", type);
}
}
}

Expand Down
Loading