Skip to content

Commit

Permalink
parisc: use constants instead of numbers in assembly
Browse files Browse the repository at this point in the history
A few small fixups:
* _PAGE_SIZE_ENCODING_DEFAULT is wrong here, as one might assume that
  it's possible to define the page size that way. This is wrong. Use 0 instead.
* use constants instead of hardcoded numerical values in depi and extru
  while building the PFN out of the pte entry
* use SHRREG instead of extru (iitlba expects the PFN at bits {7..26})

Still wondering why we can use the same register (pte) as extru source
and target register, but it seems to work on PA1.1 and PA2.0...

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  • Loading branch information
Helge Deller authored and Kyle McMartin committed Mar 31, 2009
1 parent 48d27cb commit 1152a68
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/parisc/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,8 @@

/* Get rid of prot bits and convert to page addr for iitlba */

depi _PAGE_SIZE_ENCODING_DEFAULT,31,ASM_PFN_PTE_SHIFT,\pte
extru \pte,24,25,\pte
depi 0,31,ASM_PFN_PTE_SHIFT,\pte
SHRREG \pte,(ASM_PFN_PTE_SHIFT-(31-26)),\pte
.endm

/* This is for ILP32 PA2.0 only. The TLB insertion needs
Expand Down Expand Up @@ -1337,8 +1337,8 @@ nadtlb_check_flush_11:

/* Get rid of prot bits and convert to page addr for idtlba */

depi 0,31,12,pte
extru pte,24,25,pte
depi 0,31,ASM_PFN_PTE_SHIFT,pte
SHRREG pte,(ASM_PFN_PTE_SHIFT-(31-26)),pte

mfsp %sr1,t0 /* Save sr1 so we can use it in tlb inserts */
mtsp spc,%sr1
Expand Down

0 comments on commit 1152a68

Please sign in to comment.