Re: [PATCH] x86: Simple changes to make traps_32.c and traps_64.c more similar

Ingo Molnar
2008-07-01T19:50:27Z

* Alexander van Heukelum <heukelum@mailshack.com> wrote:

> Tiny first step at unification of traps_32.c and traps_64.c. All
> changes are meant to be trivial.
> - mostly whitespace changes
> - chose one of obviously equivalent pieces of code:
> - reordering of declarations
> - simple renaming of local variables
> - if (cond) { ... } -> if (!cond) goto end_of_block ...
> - local caching of current, cpu, etc...
>
> This makes the diff between traps_32.c and traps_64.c smaller:
>
> from:
> 1474 +++++++++++++++++++++++++++++--------------------------------
> 1 file changed, 722 insertions(+), 752 deletions(-)
>
> to:
> 1052 +++++++++++++++++++++++++++++--------------------------------
> 1 file changed, 512 insertions(+), 540 deletions(-)

nice. In terms of functionality, it is supposed to be a pure
no-changes-intended commit, correct?

In that case it makes sense to split it in two: in the first (larger)
bit put the things that are provably invariant on the .o and can be
verified that way.

In the second one, put the things that change the .o output slightly
(variable reordering can do that) - this we have to check more closely.

(One can normally do such a splitup by editing the raw diff and
splitting it in half that way - by sorting each chunk into the
appropriate target patch - and then making sure the end result is still
the same.)

Ingo