Skip to content

UGLY CODE SIZE HACK #492

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

Draft
psychon wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

UGLY CODE SIZE HACK #492

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
10 changes: 5 additions & 5 deletions generator/src/generator/error_events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ fn generate_events(out: &mut Output, module: &xcbgen::defs::Module) {
}
outln!(
out,
"xproto::{}_EVENT => return Ok(Self::{}(event.try_into()?)),",
"xproto::{}_EVENT => return xproto::{}Event::ugly_hack(event),",
super::camel_case_to_upper_snake(event_name),
event_name,
);
Expand Down Expand Up @@ -367,10 +367,10 @@ fn generate_events(out: &mut Output, module: &xcbgen::defs::Module) {
}
outln!(
out.indent(),
"{}::{}_EVENT => Ok(Self::{}{}(event.try_into()?)),",
"{}::{}_EVENT => {}::{}Event::ugly_hack(event),",
ns.header,
super::camel_case_to_upper_snake(event_def.name()),
get_ns_name_prefix(ns),
ns.header,
event_def.name(),
);
}
Expand Down Expand Up @@ -424,10 +424,10 @@ fn generate_events(out: &mut Output, module: &xcbgen::defs::Module) {
}
outln!(
out.indent(),
"{}::{}_EVENT => Ok(Self::{}{}(event.try_into()?)),",
"{}::{}_EVENT => {}::{}Event::ugly_hack(event),",
ns.header,
super::camel_case_to_upper_snake(event_def.name()),
get_ns_name_prefix(ns),
ns.header,
event_def.name(),
);
}
Expand Down
53 changes: 53 additions & 0 deletions generator/src/generator/namespace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,6 +1662,59 @@ impl<'ns, 'c> NamespaceGenerator<'ns, 'c> {
self.emit_event_or_error_serialize(&full_name, &*fields, &deducible_fields, out);
}

let deducible_fields = gather_deducible_fields(&*fields);
outln!(out, "impl {name} {{", name=full_name);
out.indented(|out| {
outln!(out, "pub(crate) fn ugly_hack(remaining: &[u8]) -> Result<super::Event, ParseError> {{");
out.indented(|out| {
Self::emit_let_value_for_dynamic_align(&fields, out);
for field in fields.iter() {
self.emit_field_parse(
field,
"",
"remaining",
FieldContainer::Other,
out,
);
}
for field in fields.iter() {
if !field
.name()
.map(|field_name| deducible_fields.contains_key(field_name))
.unwrap_or(false)
{
self.emit_field_post_parse(field, out);
}
}
let field_names = fields
.iter()
.filter_map(|field| {
if self.field_is_visible(field, &deducible_fields) {
Some(to_rust_variable_name(field.name().unwrap()))
} else {
None
}
})
.collect::<Vec<_>>();
outln!(out, "let _ = remaining;");
outln!(
out,
"let result = {}Event {{ {} }};",
name,
field_names.join(", ")
);
let prefix = get_ns_name_prefix(&self.ns);
outln!(
out,
"Ok(super::Event::{}{}(result))",
prefix,
name
);
});
outln!(out, "}}");
});
outln!(out, "}}");

outln!(out, "");
}

Expand Down
16 changes: 16 additions & 0 deletions src/protocol/damage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,22 @@ impl From<NotifyEvent> for [u8; 32] {
Self::from(&input)
}
}
impl NotifyEvent {
pub(crate) fn ugly_hack(remaining: &[u8]) -> Result<super::Event, ParseError> {
let (response_type, remaining) = u8::try_parse(remaining)?;
let (level, remaining) = u8::try_parse(remaining)?;
let (sequence, remaining) = u16::try_parse(remaining)?;
let (drawable, remaining) = xproto::Drawable::try_parse(remaining)?;
let (damage, remaining) = Damage::try_parse(remaining)?;
let (timestamp, remaining) = xproto::Timestamp::try_parse(remaining)?;
let (area, remaining) = xproto::Rectangle::try_parse(remaining)?;
let (geometry, remaining) = xproto::Rectangle::try_parse(remaining)?;
let level = level.try_into()?;
let _ = remaining;
let result = NotifyEvent { response_type, level, sequence, drawable, damage, timestamp, area, geometry };
Ok(super::Event::DamageNotify(result))
}
}

/// Extension trait defining the requests of this extension.
pub trait ConnectionExt: RequestConnection {
Expand Down
30 changes: 30 additions & 0 deletions src/protocol/dri2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2009,6 +2009,25 @@ impl From<BufferSwapCompleteEvent> for [u8; 32] {
Self::from(&input)
}
}
impl BufferSwapCompleteEvent {
pub(crate) fn ugly_hack(remaining: &[u8]) -> Result<super::Event, ParseError> {
let (response_type, remaining) = u8::try_parse(remaining)?;
let remaining = remaining.get(1..).ok_or(ParseError::ParseError)?;
let (sequence, remaining) = u16::try_parse(remaining)?;
let (event_type, remaining) = u16::try_parse(remaining)?;
let remaining = remaining.get(2..).ok_or(ParseError::ParseError)?;
let (drawable, remaining) = xproto::Drawable::try_parse(remaining)?;
let (ust_hi, remaining) = u32::try_parse(remaining)?;
let (ust_lo, remaining) = u32::try_parse(remaining)?;
let (msc_hi, remaining) = u32::try_parse(remaining)?;
let (msc_lo, remaining) = u32::try_parse(remaining)?;
let (sbc, remaining) = u32::try_parse(remaining)?;
let event_type = event_type.try_into()?;
let _ = remaining;
let result = BufferSwapCompleteEvent { response_type, sequence, event_type, drawable, ust_hi, ust_lo, msc_hi, msc_lo, sbc };
Ok(super::Event::Dri2BufferSwapComplete(result))
}
}

/// Opcode for the InvalidateBuffers event
pub const INVALIDATE_BUFFERS_EVENT: u8 = 1;
Expand Down Expand Up @@ -2085,6 +2104,17 @@ impl From<InvalidateBuffersEvent> for [u8; 32] {
Self::from(&input)
}
}
impl InvalidateBuffersEvent {
pub(crate) fn ugly_hack(remaining: &[u8]) -> Result<super::Event, ParseError> {
let (response_type, remaining) = u8::try_parse(remaining)?;
let remaining = remaining.get(1..).ok_or(ParseError::ParseError)?;
let (sequence, remaining) = u16::try_parse(remaining)?;
let (drawable, remaining) = xproto::Drawable::try_parse(remaining)?;
let _ = remaining;
let result = InvalidateBuffersEvent { response_type, sequence, drawable };
Ok(super::Event::Dri2InvalidateBuffers(result))
}
}

/// Extension trait defining the requests of this extension.
pub trait ConnectionExt: RequestConnection {
Expand Down
39 changes: 39 additions & 0 deletions src/protocol/glx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,27 @@ impl From<PbufferClobberEvent> for [u8; 32] {
Self::from(&input)
}
}
impl PbufferClobberEvent {
pub(crate) fn ugly_hack(remaining: &[u8]) -> Result<super::Event, ParseError> {
let (response_type, remaining) = u8::try_parse(remaining)?;
let remaining = remaining.get(1..).ok_or(ParseError::ParseError)?;
let (sequence, remaining) = u16::try_parse(remaining)?;
let (event_type, remaining) = u16::try_parse(remaining)?;
let (draw_type, remaining) = u16::try_parse(remaining)?;
let (drawable, remaining) = Drawable::try_parse(remaining)?;
let (b_mask, remaining) = u32::try_parse(remaining)?;
let (aux_buffer, remaining) = u16::try_parse(remaining)?;
let (x, remaining) = u16::try_parse(remaining)?;
let (y, remaining) = u16::try_parse(remaining)?;
let (width, remaining) = u16::try_parse(remaining)?;
let (height, remaining) = u16::try_parse(remaining)?;
let (count, remaining) = u16::try_parse(remaining)?;
let remaining = remaining.get(4..).ok_or(ParseError::ParseError)?;
let _ = remaining;
let result = PbufferClobberEvent { response_type, sequence, event_type, draw_type, drawable, b_mask, aux_buffer, x, y, width, height, count };
Ok(super::Event::GlxPbufferClobber(result))
}
}

/// Opcode for the BufferSwapComplete event
pub const BUFFER_SWAP_COMPLETE_EVENT: u8 = 1;
Expand Down Expand Up @@ -391,6 +412,24 @@ impl From<BufferSwapCompleteEvent> for [u8; 32] {
Self::from(&input)
}
}
impl BufferSwapCompleteEvent {
pub(crate) fn ugly_hack(remaining: &[u8]) -> Result<super::Event, ParseError> {
let (response_type, remaining) = u8::try_parse(remaining)?;
let remaining = remaining.get(1..).ok_or(ParseError::ParseError)?;
let (sequence, remaining) = u16::try_parse(remaining)?;
let (event_type, remaining) = u16::try_parse(remaining)?;
let remaining = remaining.get(2..).ok_or(ParseError::ParseError)?;
let (drawable, remaining) = Drawable::try_parse(remaining)?;
let (ust_hi, remaining) = u32::try_parse(remaining)?;
let (ust_lo, remaining) = u32::try_parse(remaining)?;
let (msc_hi, remaining) = u32::try_parse(remaining)?;
let (msc_lo, remaining) = u32::try_parse(remaining)?;
let (sbc, remaining) = u32::try_parse(remaining)?;
let _ = remaining;
let result = BufferSwapCompleteEvent { response_type, sequence, event_type, drawable, ust_hi, ust_lo, msc_hi, msc_lo, sbc };
Ok(super::Event::GlxBufferSwapComplete(result))
}
}

#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[repr(u16)]
Expand Down
Loading